fix(private-cluster): master_ipv4_cidr_block on enable_private_nodes (#…

…2250)
terraform-google-modules · Jan 22, 2025 · 3ecf473 · 3ecf473
1 parent 35ead26
commit 3ecf473
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 9 deletions.
diff --git a/autogen/main/outputs.tf.tmpl b/autogen/main/outputs.tf.tmpl
@@ -207,7 +207,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" {

diff --git a/modules/beta-autopilot-private-cluster/outputs.tf b/modules/beta-autopilot-private-cluster/outputs.tf
@@ -165,7 +165,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" {

diff --git a/modules/beta-private-cluster-update-variant/outputs.tf b/modules/beta-private-cluster-update-variant/outputs.tf
@@ -192,7 +192,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" {

diff --git a/modules/beta-private-cluster/outputs.tf b/modules/beta-private-cluster/outputs.tf
@@ -192,7 +192,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" {

diff --git a/modules/private-cluster-update-variant/outputs.tf b/modules/private-cluster-update-variant/outputs.tf
@@ -192,7 +192,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" {

diff --git a/modules/private-cluster/outputs.tf b/modules/private-cluster/outputs.tf
@@ -192,7 +192,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" {

diff --git a/...tegration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json b/...tegration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json
@@ -200,9 +200,6 @@
           "mode": "GKE_METADATA"
         }
       },
-      "locations": [
-        "us-central1-a"
-      ],
       "management": {
         "autoRepair": true,
         "autoUpgrade": true