Merge pull request terraform-google-modules#214 from kevensen/output-…

…updates Changed the endpoint variable to be dependent on GKE cluster state
WALTER-GROUP · Jul 23, 2019 · 9804a38 · 9804a38
2 parents 9c9f728 + 8a62502
commit 9804a38
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 0 deletions.
diff --git a/autogen/outputs.tf b/autogen/outputs.tf
@@ -45,6 +45,18 @@ output "endpoint" {
   sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
+  depends_on  = [
+    /* Nominally, the endpoint is populated as soon as it is known to Terraform.
+    * However, the cluster may not be in a usable state yet.  Therefore any
+    * resources dependent on the cluster being up will fail to deploy.  With
+    * this explicit dependency, dependent resources can wait for the cluster
+    * to be up.
+    */ 
+    google_container_cluster.primary,
+    google_container_node_pool.pools,
+    google_container_cluster.zonal_primary,
+    google_container_node_pool.zonal_pools,
+  ]
 }
 
 output "min_master_version" {
@@ -112,6 +124,7 @@ output "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`."
   value       = local.service_account
 }
+
 {% if beta_cluster %}
 
 output "istio_enabled" {
@@ -128,4 +141,5 @@ output "pod_security_policy_enabled" {
   description = "Whether pod security policy is enabled"
   value       = local.cluster_pod_security_policy_enabled
 }
+
 {% endif %}
diff --git a/modules/beta-private-cluster/outputs.tf b/modules/beta-private-cluster/outputs.tf
@@ -45,6 +45,18 @@ output "endpoint" {
   sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
+  depends_on  = [
+    /* Nominally, the endpoint is populated as soon as it is known to Terraform.
+    * However, the cluster may not be in a usable state yet.  Therefore any
+    * resources dependent on the cluster being up will fail to deploy.  With
+    * this explicit dependency, dependent resources can wait for the cluster
+    * to be up.
+    */ 
+    google_container_cluster.primary,
+    google_container_node_pool.pools,
+    google_container_cluster.zonal_primary,
+    google_container_node_pool.zonal_pools,
+  ]
 }
 
 output "min_master_version" {
@@ -113,6 +125,7 @@ output "service_account" {
   value       = local.service_account
 }
 
+
 output "istio_enabled" {
   description = "Whether Istio is enabled"
   value       = local.cluster_istio_enabled
@@ -127,3 +140,4 @@ output "pod_security_policy_enabled" {
   description = "Whether pod security policy is enabled"
   value       = local.cluster_pod_security_policy_enabled
 }
+
diff --git a/modules/beta-public-cluster/outputs.tf b/modules/beta-public-cluster/outputs.tf
@@ -45,6 +45,18 @@ output "endpoint" {
   sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
+  depends_on  = [
+    /* Nominally, the endpoint is populated as soon as it is known to Terraform.
+    * However, the cluster may not be in a usable state yet.  Therefore any
+    * resources dependent on the cluster being up will fail to deploy.  With
+    * this explicit dependency, dependent resources can wait for the cluster
+    * to be up.
+    */ 
+    google_container_cluster.primary,
+    google_container_node_pool.pools,
+    google_container_cluster.zonal_primary,
+    google_container_node_pool.zonal_pools,
+  ]
 }
 
 output "min_master_version" {
@@ -113,6 +125,7 @@ output "service_account" {
   value       = local.service_account
 }
 
+
 output "istio_enabled" {
   description = "Whether Istio is enabled"
   value       = local.cluster_istio_enabled
@@ -127,3 +140,4 @@ output "pod_security_policy_enabled" {
   description = "Whether pod security policy is enabled"
   value       = local.cluster_pod_security_policy_enabled
 }
+
diff --git a/modules/private-cluster/outputs.tf b/modules/private-cluster/outputs.tf
@@ -45,6 +45,18 @@ output "endpoint" {
   sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
+  depends_on  = [
+    /* Nominally, the endpoint is populated as soon as it is known to Terraform.
+    * However, the cluster may not be in a usable state yet.  Therefore any
+    * resources dependent on the cluster being up will fail to deploy.  With
+    * this explicit dependency, dependent resources can wait for the cluster
+    * to be up.
+    */ 
+    google_container_cluster.primary,
+    google_container_node_pool.pools,
+    google_container_cluster.zonal_primary,
+    google_container_node_pool.zonal_pools,
+  ]
 }
 
 output "min_master_version" {
@@ -112,3 +124,4 @@ output "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`."
   value       = local.service_account
 }
+
diff --git a/outputs.tf b/outputs.tf
@@ -45,6 +45,18 @@ output "endpoint" {
   sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
+  depends_on  = [
+    /* Nominally, the endpoint is populated as soon as it is known to Terraform.
+    * However, the cluster may not be in a usable state yet.  Therefore any
+    * resources dependent on the cluster being up will fail to deploy.  With
+    * this explicit dependency, dependent resources can wait for the cluster
+    * to be up.
+    */ 
+    google_container_cluster.primary,
+    google_container_node_pool.pools,
+    google_container_cluster.zonal_primary,
+    google_container_node_pool.zonal_pools,
+  ]
 }
 
 output "min_master_version" {
@@ -112,3 +124,4 @@ output "service_account" {
   description = "The service account to default running nodes as if not overridden in `node_pools`."
   value       = local.service_account
 }
+