fix(TPG6.17): fix autopilot

apeabody · apeabody · commit edfbf2b21456 · 2025-01-29T01:56:06.000Z
diff --git a/autogen/main/versions.tf.tmpl b/autogen/main/versions.tf.tmpl
@@ -34,17 +34,17 @@ terraform {
   required_providers {
     google = {
       source = "hashicorp/google"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
     google-beta = {
       source = "hashicorp/google-beta"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
 {% elif autopilot_cluster  %}
   required_providers {
     google = {
       source = "hashicorp/google"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
 {% else %}
   required_providers {
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.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
     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.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
     google-beta = {
       source  = "hashicorp/google-beta"
-      version = ">= 6.14.0, < 7"
+      version = ">= 6.14.0, < 6.17"
     }
     kubernetes = {
       source  = "hashicorp/kubernetes"
diff --git a/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json b/test/integration/private_zonal_with_networking/testdata/TestPrivateZonalWithNetworking.json
@@ -216,7 +216,7 @@
         "effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
         "imageType": "COS_CONTAINERD",
         "kubeletConfig": {
-          "insecureKubeletReadonlyPortEnabled": true
+          "insecureKubeletReadonlyPortEnabled": false
         },
         "labels": {
           "cluster_name": "CLUSTER_NAME",
diff --git a/test/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json b/test/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json
@@ -38,7 +38,6 @@
       "publicEndpoint": "KUBERNETES_ENDPOINT"
     }
   },
-  "currentNodeCount": 3,
   "databaseEncryption": {
     "currentState": "CURRENT_STATE_DECRYPTED",
     "state": "DECRYPTED"
diff --git a/test/integration/stub_domains/testdata/TestStubDomains.json b/test/integration/stub_domains/testdata/TestStubDomains.json
@@ -36,7 +36,6 @@
       "publicEndpoint": "KUBERNETES_ENDPOINT"
     }
   },
-  "currentNodeCount": 3,
   "databaseEncryption": {
     "currentState": "CURRENT_STATE_DECRYPTED",
     "state": "DECRYPTED"
diff --git a/test/integration/stub_domains_upstream_nameservers/testdata/TestStubDomainsUpstreamNameservers.json b/test/integration/stub_domains_upstream_nameservers/testdata/TestStubDomainsUpstreamNameservers.json
@@ -36,7 +36,6 @@
       "publicEndpoint": "KUBERNETES_ENDPOINT"
     }
   },
-  "currentNodeCount": 3,
   "databaseEncryption": {
     "currentState": "CURRENT_STATE_DECRYPTED",
     "state": "DECRYPTED"
diff --git a/test/integration/workload_metadata_config/testdata/TestWorkloadMetadataConfig.json b/test/integration/workload_metadata_config/testdata/TestWorkloadMetadataConfig.json
@@ -35,7 +35,6 @@
       "privateEndpoint": "KUBERNETES_ENDPOINT"
     }
   },
-  "currentNodeCount": 1,
   "databaseEncryption": {
     "currentState": "CURRENT_STATE_DECRYPTED",
     "state": "DECRYPTED"

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.14.0, < 7"`
	`24`	`+ version = ">= 6.14.0, < 6.17"`
`25`	`25`	`}`
`26`	`26`	`google-beta = {`
`27`	`27`	`source = "hashicorp/google-beta"`
`28`		`- version = ">= 6.14.0, < 7"`
	`28`	`+ version = ">= 6.14.0, < 6.17"`
`29`	`29`	`}`
`30`	`30`	`kubernetes = {`
`31`	`31`	`source = "hashicorp/kubernetes"`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,6 @@`
`38`	`38`	`"publicEndpoint": "KUBERNETES_ENDPOINT"`
`39`	`39`	`}`
`40`	`40`	`},`
`41`		`- "currentNodeCount": 3,`
`42`	`41`	`"databaseEncryption": {`
`43`	`42`	`"currentState": "CURRENT_STATE_DECRYPTED",`
`44`	`43`	`"state": "DECRYPTED"`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,6 @@`
`36`	`36`	`"publicEndpoint": "KUBERNETES_ENDPOINT"`
`37`	`37`	`}`
`38`	`38`	`},`
`39`		`- "currentNodeCount": 3,`
`40`	`39`	`"databaseEncryption": {`
`41`	`40`	`"currentState": "CURRENT_STATE_DECRYPTED",`
`42`	`41`	`"state": "DECRYPTED"`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,6 @@`
`35`	`35`	`"privateEndpoint": "KUBERNETES_ENDPOINT"`
`36`	`36`	`}`
`37`	`37`	`},`
`38`		`- "currentNodeCount": 1,`
`39`	`38`	`"databaseEncryption": {`
`40`	`39`	`"currentState": "CURRENT_STATE_DECRYPTED",`
`41`	`40`	`"state": "DECRYPTED"`