Merge pull request #7938 from ameukam/prow-build-bump-providers

k8s-ci-robot · web-flow · commit 30d62397f971 · 2025-03-26T05:10:36.000-07:00
gcp: Bump terraform providers for build clusters
diff --git a/infra/gcp/terraform/k8s-infra-prow-build-trusted/00-provider.tf b/infra/gcp/terraform/k8s-infra-prow-build-trusted/00-provider.tf
@@ -30,11 +30,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.73.2"
+      version = "~> 5.45.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 4.73.2"
+      version = "~> 5.45.0"
     }
   }
 }
diff --git a/infra/gcp/terraform/k8s-infra-prow-build-trusted/iam.tf b/infra/gcp/terraform/k8s-infra-prow-build-trusted/iam.tf
@@ -16,7 +16,7 @@ limitations under the License.
 
 module "iam" {
   source  = "terraform-google-modules/iam/google//modules/projects_iam"
-  version = "~> 7"
+  version = "~> 8.1"
 
   projects = [module.project.project_id]
 
diff --git a/infra/gcp/terraform/k8s-infra-prow-build-trusted/secrets.tf b/infra/gcp/terraform/k8s-infra-prow-build-trusted/secrets.tf
@@ -83,7 +83,7 @@ resource "google_secret_manager_secret" "build_cluster_secrets" {
     group = each.value.group
   }
   replication {
-    automatic = true
+    auto {}
   }
 }
 
diff --git a/infra/gcp/terraform/k8s-infra-prow-build/00-provider.tf b/infra/gcp/terraform/k8s-infra-prow-build/00-provider.tf
@@ -30,11 +30,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.73.2"
+      version = "~> 5.45.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 4.73.2"
+      version = "~> 5.45.0"
     }
   }
 }
diff --git a/infra/gcp/terraform/k8s-infra-prow-build/iam.tf b/infra/gcp/terraform/k8s-infra-prow-build/iam.tf
@@ -16,7 +16,7 @@ limitations under the License.
 
 module "iam" {
   source  = "terraform-google-modules/iam/google//modules/projects_iam"
-  version = "~> 7"
+  version = "~> 8.1"
 
   projects = [module.project.project_id]
 
diff --git a/infra/gcp/terraform/k8s-infra-prow-build/secrets.tf b/infra/gcp/terraform/k8s-infra-prow-build/secrets.tf
@@ -39,7 +39,7 @@ resource "google_secret_manager_secret" "build_cluster_secrets" {
     group = each.value.group
   }
   replication {
-    automatic = true
+    auto {}
   }
 }
 
diff --git a/infra/gcp/terraform/modules/gke-cluster/versions.tf b/infra/gcp/terraform/modules/gke-cluster/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.73.2"
+      version = "~> 5.45.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 4.73.2"
+      version = "~> 5.45.0"
     }
   }
 }
diff --git a/infra/gcp/terraform/modules/gke-nodepool/main.tf b/infra/gcp/terraform/modules/gke-nodepool/main.tf
@@ -46,7 +46,6 @@ resource "google_container_node_pool" "node_pool" {
     disk_size_gb = var.disk_size_gb
     disk_type    = var.disk_type
     labels       = var.labels
-    taint        = var.taints
 
     service_account = var.service_account
     oauth_scopes    = ["https://www.googleapis.com/auth/cloud-platform"]
@@ -65,6 +64,14 @@ resource "google_container_node_pool" "node_pool" {
     metadata = {
       disable-legacy-endpoints = "true"
     }
+    dynamic "taint" {
+      for_each = var.taints
+      content {
+        effect = taint.value.effect
+        key    = taint.value.key
+        value  = taint.value.value
+      }
+    }
   }
 
   // If we need to destroy the node pool, create the new one before destroying
diff --git a/infra/gcp/terraform/modules/gke-nodepool/versions.tf b/infra/gcp/terraform/modules/gke-nodepool/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.73.2"
+      version = "~> 5.45.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 4.73.2"
+      version = "~> 5.45.0"
     }
   }
 }
diff --git a/infra/gcp/terraform/modules/gke-project/versions.tf b/infra/gcp/terraform/modules/gke-project/versions.tf
@@ -20,11 +20,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 4.73.2"
+      version = "~> 5.45.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 4.73.2"
+      version = "~> 5.45.0"
     }
   }
 }
diff --git a/infra/gcp/terraform/modules/workload-identity-service-account/versions.tf b/infra/gcp/terraform/modules/workload-identity-service-account/versions.tf
@@ -17,11 +17,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = "~> 5.44.0"
+      version = "~> 5.45.0"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = "~> 5.44.0"
+      version = "~> 5.45.0"
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -30,11 +30,11 @@ terraform {`
`30`	`30`	`required_providers {`
`31`	`31`	`google = {`
`32`	`32`	`source = "hashicorp/google"`
`33`		`- version = "~> 4.73.2"`
	`33`	`+ version = "~> 5.45.0"`
`34`	`34`	`}`
`35`	`35`	`google-beta = {`
`36`	`36`	`source = "hashicorp/google-beta"`
`37`		`- version = "~> 4.73.2"`
	`37`	`+ version = "~> 5.45.0"`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,7 @@ resource "google_secret_manager_secret" "build_cluster_secrets" {`
`83`	`83`	`group = each.value.group`
`84`	`84`	`}`
`85`	`85`	`replication {`
`86`		`- automatic = true`
	`86`	`+ auto {}`
`87`	`87`	`}`
`88`	`88`	`}`
`89`	`89`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ resource "google_secret_manager_secret" "build_cluster_secrets" {`
`39`	`39`	`group = each.value.group`
`40`	`40`	`}`
`41`	`41`	`replication {`
`42`		`- automatic = true`
	`42`	`+ auto {}`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ terraform {`
`20`	`20`	`required_providers {`
`21`	`21`	`google = {`
`22`	`22`	`source = "hashicorp/google"`
`23`		`- version = "~> 4.73.2"`
	`23`	`+ version = "~> 5.45.0"`
`24`	`24`	`}`
`25`	`25`	`google-beta = {`
`26`	`26`	`source = "hashicorp/google-beta"`
`27`		`- version = "~> 4.73.2"`
	`27`	`+ version = "~> 5.45.0"`
`28`	`28`	`}`
`29`	`29`	`}`
`30`	`30`	`}`