fix: enable TPG v6.11+ (#2197)

apeabody · web-flow · commit e9ab0df39601 · 2024-11-27T08:28:18.000-08:00
diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl
@@ -24,33 +24,33 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
 {% elif beta_cluster and autopilot_cluster %}
   required_providers {
     google = {
       source = "hashicorp/google"
-      version = ">= 6.8.0, < 6.11.0"
+      version = ">= 6.8.0, < 7"
     }
     google-beta = {
       source = "hashicorp/google-beta"
-      version = ">= 6.8.0, < 6.11.0"
+      version = ">= 6.8.0, < 7"
     }
 {% elif autopilot_cluster  %}
   required_providers {
     google = {
       source = "hashicorp/google"
-      version = ">= 6.8.0, < 6.11.0"
+      version = ">= 6.8.0, < 7"
     }
 {% else %}
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
 {% endif %}
     kubernetes = {
diff --git a/examples/simple_regional_beta/main.tf b/examples/simple_regional_beta/main.tf
@@ -30,26 +30,26 @@ module "gke" {
   source  = "terraform-google-modules/kubernetes-engine/google//modules/beta-public-cluster"
   version = "~> 34.0"
 
-  project_id                    = var.project_id
-  name                          = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
-  regional                      = var.regional
-  region                        = var.region
-  zones                         = var.zones
-  network                       = var.network
-  subnetwork                    = var.subnetwork
-  ip_range_pods                 = var.ip_range_pods
-  ip_range_services             = var.ip_range_services
-  create_service_account        = var.compute_engine_service_account == "create"
-  service_account               = var.compute_engine_service_account
-  dns_cache                     = var.dns_cache
-  gce_pd_csi_driver             = var.gce_pd_csi_driver
-  sandbox_enabled               = var.sandbox_enabled
-  remove_default_node_pool      = var.remove_default_node_pool
-  node_pools                    = var.node_pools
-  database_encryption           = var.database_encryption
-  enable_binary_authorization   = var.enable_binary_authorization
-  enable_pod_security_policy    = var.enable_pod_security_policy
-  enable_identity_service       = true
+  project_id                  = var.project_id
+  name                        = "${local.cluster_type}-cluster${var.cluster_name_suffix}"
+  regional                    = var.regional
+  region                      = var.region
+  zones                       = var.zones
+  network                     = var.network
+  subnetwork                  = var.subnetwork
+  ip_range_pods               = var.ip_range_pods
+  ip_range_services           = var.ip_range_services
+  create_service_account      = var.compute_engine_service_account == "create"
+  service_account             = var.compute_engine_service_account
+  dns_cache                   = var.dns_cache
+  gce_pd_csi_driver           = var.gce_pd_csi_driver
+  sandbox_enabled             = var.sandbox_enabled
+  remove_default_node_pool    = var.remove_default_node_pool
+  node_pools                  = var.node_pools
+  database_encryption         = var.database_encryption
+  enable_binary_authorization = var.enable_binary_authorization
+  enable_pod_security_policy  = var.enable_pod_security_policy
+  // enable_identity_service       = true TODO: b/378974729
   release_channel               = "REGULAR"
   logging_enabled_components    = ["SYSTEM_COMPONENTS"]
   monitoring_enabled_components = ["SYSTEM_COMPONENTS"]
diff --git a/modules/beta-autopilot-private-cluster/versions.tf b/modules/beta-autopilot-private-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.8.0, < 6.11.0"
+      version = ">= 6.8.0, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.8.0, < 6.11.0"
+      version = ">= 6.8.0, < 7"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-autopilot-public-cluster/versions.tf b/modules/beta-autopilot-public-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.8.0, < 6.11.0"
+      version = ">= 6.8.0, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.8.0, < 6.11.0"
+      version = ">= 6.8.0, < 7"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-private-cluster-update-variant/versions.tf b/modules/beta-private-cluster-update-variant/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-private-cluster/versions.tf b/modules/beta-private-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-public-cluster-update-variant/versions.tf b/modules/beta-public-cluster-update-variant/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/beta-public-cluster/versions.tf b/modules/beta-public-cluster/versions.tf
@@ -21,11 +21,11 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/private-cluster-update-variant/versions.tf b/modules/private-cluster-update-variant/versions.tf
@@ -21,7 +21,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/modules/private-cluster/versions.tf b/modules/private-cluster/versions.tf
@@ -21,7 +21,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/test/integration/beta_cluster/beta_cluster_test.go b/test/integration/beta_cluster/beta_cluster_test.go
@@ -54,7 +54,7 @@ func TestBetaCluster(t *testing.T) {
 			"privateClusterConfig.enablePrivateEndpoint",
 			"networkConfig.datapathProvider",
 			"databaseEncryption.state",
-			"identityServiceConfig.enabled",
+			// "identityServiceConfig.enabled", TODO: b/378974729
 			"addonsConfig",
 			"networkConfig.datapathProvider",
 			"binaryAuthorization",
diff --git a/versions.tf b/versions.tf
@@ -21,7 +21,7 @@ terraform {
   required_providers {
     google = {
       source  = "hashicorp/google"
-      version = ">= 6.7.0, < 6.11.0"
+      version = ">= 6.7.0, < 7"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"

Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ terraform {`
`21`	`21`	`required_providers {`
`22`	`22`	`google = {`
`23`	`23`	`source = "hashicorp/google"`
`24`		`- version = ">= 6.8.0, < 6.11.0"`
	`24`	`+ version = ">= 6.8.0, < 7"`
`25`	`25`	`}`
`26`	`26`	`google-beta = {`
`27`	`27`	`source = "hashicorp/google-beta"`
`28`		`- version = ">= 6.8.0, < 6.11.0"`
	`28`	`+ version = ">= 6.8.0, < 7"`
`29`	`29`	`}`
`30`	`30`	`kubernetes = {`
`31`	`31`	`source = "hashicorp/kubernetes"`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ terraform {`
`21`	`21`	`required_providers {`
`22`	`22`	`google = {`
`23`	`23`	`source = "hashicorp/google"`
`24`		`- version = ">= 6.7.0, < 6.11.0"`
	`24`	`+ version = ">= 6.7.0, < 7"`
`25`	`25`	`}`
`26`	`26`	`kubernetes = {`
`27`	`27`	`source = "hashicorp/kubernetes"`