Merge branch 'main' into wyardley/2248

Author: apeabody

autogen/main/outputs.tf.tmpl

@@ -206,7 +206,7 @@ output "mesh_certificates_config" {
 
 output "master_ipv4_cidr_block" {
   description = "The IP range in CIDR notation used for the hosted master network"
-  value       = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block
+  value       = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null
 }
 
 output "peering_name" {

modules/beta-autopilot-private-cluster/outputs.tf

@@ -164,7 +164,7 @@ output "tpu_ipv4_cidr_block" {
 
 output "master_ipv4_cidr_block" {
   description = "The IP range in CIDR notation used for the hosted master network"
-  value       = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block
+  value       = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null
 }
 
 output "peering_name" {

modules/beta-private-cluster-update-variant/outputs.tf

@@ -191,7 +191,7 @@ output "mesh_certificates_config" {
 
 output "master_ipv4_cidr_block" {
   description = "The IP range in CIDR notation used for the hosted master network"
-  value       = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block
+  value       = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null
 }
 
 output "peering_name" {

modules/beta-private-cluster/outputs.tf

@@ -191,7 +191,7 @@ output "mesh_certificates_config" {
 
 output "master_ipv4_cidr_block" {
   description = "The IP range in CIDR notation used for the hosted master network"
-  value       = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block
+  value       = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null
 }
 
 output "peering_name" {

modules/private-cluster-update-variant/outputs.tf

@@ -191,7 +191,7 @@ output "mesh_certificates_config" {
 
 output "master_ipv4_cidr_block" {
   description = "The IP range in CIDR notation used for the hosted master network"
-  value       = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block
+  value       = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null
 }
 
 output "peering_name" {

modules/private-cluster/outputs.tf

@@ -191,7 +191,7 @@ output "mesh_certificates_config" {
 
 output "master_ipv4_cidr_block" {
   description = "The IP range in CIDR notation used for the hosted master network"
-  value       = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block
+  value       = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null
 }
 
 output "peering_name" {

test/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json

@@ -200,9 +200,6 @@
           "mode": "GKE_METADATA"
         }
       },
-      "locations": [
-        "us-central1-a"
-      ],
       "management": {
         "autoRepair": true,
         "autoUpgrade": true