diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl index 92e672ec9e..33b95ec566 100644 --- 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 index 268d694c84..49772886ba 100644 --- 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 index 9553b7b4f1..e7c2c24c03 100644 --- 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 index 3f11ce7b3c..b88591526d 100644 --- 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 index ec5636a69d..e6ad954675 100644 --- 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 index 4cce012848..e4000c1395 100644 --- 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 index 75f8b61161..f6240f6090 100644 --- 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 index 22ae4af486..6b8c859486 100644 --- 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 index 5a1601751f..50d825967e 100644 --- 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 index 8e2dca9d65..ce566c254c 100644 --- 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 index ecc481d18f..e5cfeb5c3b 100755 --- 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 index cf97b23f4a..999d0bf22e 100644 --- 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"