fix: node pool creation should depend on necessary firewall rules (#2245

)
terraform-google-modules · Jan 15, 2025 · 8098489 · 8098489
1 parent 9ad4082
commit 8098489
Show file tree

Hide file tree

Showing 8 changed files with 55 additions and 10 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -1153,9 +1153,12 @@ resource "google_container_node_pool" "windows_pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
-  {% if i == 1 %}
-  depends_on = [google_container_node_pool.pools[0]]
-  {% endif %}
+  depends_on = [
+    google_compute_firewall.intra_egress,
+    {% if i == 1 %}
+    google_container_node_pool.pools[0],
+    {% endif %}
+  ]
 }
 {% endfor %}
 {% endif %}
diff --git a/cluster.tf b/cluster.tf
@@ -845,6 +845,9 @@ resource "google_container_node_pool" "pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
+  depends_on = [
+    google_compute_firewall.intra_egress,
+  ]
 }
 resource "google_container_node_pool" "windows_pools" {
   provider = google
@@ -1127,5 +1130,8 @@ resource "google_container_node_pool" "windows_pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
-  depends_on = [google_container_node_pool.pools[0]]
+  depends_on = [
+    google_compute_firewall.intra_egress,
+    google_container_node_pool.pools[0],
+  ]
 }
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -1016,6 +1016,9 @@ resource "google_container_node_pool" "pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
+  depends_on = [
+    google_compute_firewall.intra_egress,
+  ]
 }
 resource "google_container_node_pool" "windows_pools" {
   provider = google-beta
@@ -1312,5 +1315,8 @@ resource "google_container_node_pool" "windows_pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
-  depends_on = [google_container_node_pool.pools[0]]
+  depends_on = [
+    google_compute_firewall.intra_egress,
+    google_container_node_pool.pools[0],
+  ]
 }
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -934,6 +934,9 @@ resource "google_container_node_pool" "pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
+  depends_on = [
+    google_compute_firewall.intra_egress,
+  ]
 }
 resource "google_container_node_pool" "windows_pools" {
   provider = google-beta
@@ -1229,5 +1232,8 @@ resource "google_container_node_pool" "windows_pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
-  depends_on = [google_container_node_pool.pools[0]]
+  depends_on = [
+    google_compute_firewall.intra_egress,
+    google_container_node_pool.pools[0],
+  ]
 }
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -986,6 +986,9 @@ resource "google_container_node_pool" "pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
+  depends_on = [
+    google_compute_firewall.intra_egress,
+  ]
 }
 resource "google_container_node_pool" "windows_pools" {
   provider = google-beta
@@ -1282,5 +1285,8 @@ resource "google_container_node_pool" "windows_pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
-  depends_on = [google_container_node_pool.pools[0]]
+  depends_on = [
+    google_compute_firewall.intra_egress,
+    google_container_node_pool.pools[0],
+  ]
 }
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -904,6 +904,9 @@ resource "google_container_node_pool" "pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
+  depends_on = [
+    google_compute_firewall.intra_egress,
+  ]
 }
 resource "google_container_node_pool" "windows_pools" {
   provider = google-beta
@@ -1199,5 +1202,8 @@ resource "google_container_node_pool" "windows_pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
-  depends_on = [google_container_node_pool.pools[0]]
+  depends_on = [
+    google_compute_firewall.intra_egress,
+    google_container_node_pool.pools[0],
+  ]
 }
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -956,6 +956,9 @@ resource "google_container_node_pool" "pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
+  depends_on = [
+    google_compute_firewall.intra_egress,
+  ]
 }
 resource "google_container_node_pool" "windows_pools" {
   provider = google
@@ -1239,5 +1242,8 @@ resource "google_container_node_pool" "windows_pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
-  depends_on = [google_container_node_pool.pools[0]]
+  depends_on = [
+    google_compute_firewall.intra_egress,
+    google_container_node_pool.pools[0],
+  ]
 }
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -875,6 +875,9 @@ resource "google_container_node_pool" "pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
+  depends_on = [
+    google_compute_firewall.intra_egress,
+  ]
 }
 resource "google_container_node_pool" "windows_pools" {
   provider = google
@@ -1157,5 +1160,8 @@ resource "google_container_node_pool" "windows_pools" {
     delete = lookup(var.timeouts, "delete", "45m")
   }
 
-  depends_on = [google_container_node_pool.pools[0]]
+  depends_on = [
+    google_compute_firewall.intra_egress,
+    google_container_node_pool.pools[0],
+  ]
 }