Merge branch 'main' into feature/add-custom-metrics-writer-role

terraform-google-modules · Jan 16, 2025 · f9919c6 · f9919c6
2 parents bf60dc9 + 9a5aa01
commit f9919c6
Show file tree

Hide file tree

Showing 16 changed files with 65 additions and 21 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/examples/acm-terraform-blog-part1/terraform/gke.tf b/examples/acm-terraform-blog-part1/terraform/gke.tf
@@ -16,7 +16,7 @@
 
 module "enabled_google_apis" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
-  version = "~> 17.0"
+  version = "~> 18.0"
 
   project_id                  = var.project
   disable_services_on_destroy = false

diff --git a/examples/acm-terraform-blog-part2/terraform/gke.tf b/examples/acm-terraform-blog-part2/terraform/gke.tf
@@ -16,7 +16,7 @@
 
 module "enabled_google_apis" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
-  version = "~> 17.0"
+  version = "~> 18.0"
 
   project_id                  = var.project
   disable_services_on_destroy = false

diff --git a/examples/acm-terraform-blog-part3/terraform/gke.tf b/examples/acm-terraform-blog-part3/terraform/gke.tf
@@ -16,7 +16,7 @@
 
 module "enabled_google_apis" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
-  version = "~> 17.0"
+  version = "~> 18.0"
 
   project_id                  = var.project
   disable_services_on_destroy = false

diff --git a/examples/safer_cluster_iap_bastion/apis.tf b/examples/safer_cluster_iap_bastion/apis.tf
@@ -16,7 +16,7 @@
 
 module "enabled_google_apis" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
-  version = "~> 17.0"
+  version = "~> 18.0"
 
   project_id                  = var.project_id
   disable_services_on_destroy = false

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/binary-authorization/main.tf b/modules/binary-authorization/main.tf
@@ -25,7 +25,7 @@ locals {
 
 module "project-services" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
-  version = "~> 17.0"
+  version = "~> 18.0"
 
   project_id    = var.project_id
   activate_apis = local.required_enabled_apis

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],
+  ]
 }
diff --git a/modules/services/main.tf b/modules/services/main.tf
@@ -16,7 +16,7 @@
 
 module "services" {
   source  = "terraform-google-modules/project-factory/google//modules/project_services"
-  version = "~> 17.0"
+  version = "~> 18.0"
 
   project_id                  = var.project_id
   enable_apis                 = var.enable_apis

diff --git a/test/integration/node_pool/testdata/TestNodePool.json b/test/integration/node_pool/testdata/TestNodePool.json
@@ -86,7 +86,6 @@
     "clusterIpv4Cidr": "192.168.0.0/18",
     "clusterIpv4CidrBlock": "192.168.0.0/18",
     "clusterSecondaryRangeName": "cft-gke-test-pods-RANDOM_STRING",
-    "defaultPodIpv4RangeUtilization": 0.0624,
     "podCidrOverprovisionConfig": {},
     "servicesIpv4Cidr": "192.168.64.0/18",
     "servicesIpv4CidrBlock": "192.168.64.0/18",

diff --git a/test/setup/main.tf b/test/setup/main.tf
@@ -46,7 +46,7 @@ locals {
 
 module "gke-project-1" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 17.0"
+  version = "~> 18.0"
 
   name                     = "ci-gke-${random_id.random_project_id_suffix.hex}"
   random_project_id        = true
@@ -70,7 +70,7 @@ module "gke-project-1" {
 
 module "gke-project-2" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 17.0"
+  version = "~> 18.0"
 
   name              = "ci-gke-${random_id.random_project_id_suffix.hex}"
   random_project_id = true
@@ -92,7 +92,7 @@ module "gke-project-2" {
 # apis as documented https://cloud.google.com/service-mesh/docs/scripted-install/reference#setting_up_your_project
 module "gke-project-asm" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 17.0"
+  version = "~> 18.0"
 
   name              = "ci-gke-asm-${random_id.random_project_id_suffix.hex}"
   random_project_id = true
@@ -107,7 +107,7 @@ module "gke-project-asm" {
 
 module "gke-project-fleet" {
   source  = "terraform-google-modules/project-factory/google"
-  version = "~> 17.0"
+  version = "~> 18.0"
 
   name              = "ci-gke-fleet-${random_id.random_project_id_suffix.hex}"
   random_project_id = true