Merge branch 'main' into fix-dns-endpoint-config

apeabody · web-flow · commit 86980c08c92a · 2025-01-22T15:28:57.000-08:00
diff --git a/autogen/main/outputs.tf.tmpl b/autogen/main/outputs.tf.tmpl
@@ -59,7 +59,6 @@ output "zones" {
 }
 
 output "endpoint" {
-  sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
   depends_on = [
@@ -207,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" {
diff --git a/examples/simple_regional_private_with_cluster_version/outputs.tf b/examples/simple_regional_private_with_cluster_version/outputs.tf
@@ -15,8 +15,7 @@
  */
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.gke.endpoint
+  value = module.gke.endpoint
 }
 
 output "client_token" {
diff --git a/modules/beta-autopilot-private-cluster/outputs.tf b/modules/beta-autopilot-private-cluster/outputs.tf
@@ -56,7 +56,6 @@ output "zones" {
 }
 
 output "endpoint" {
-  sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
   depends_on = [
@@ -165,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" {
diff --git a/modules/beta-autopilot-public-cluster/outputs.tf b/modules/beta-autopilot-public-cluster/outputs.tf
@@ -56,7 +56,6 @@ output "zones" {
 }
 
 output "endpoint" {
-  sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
   depends_on = [
diff --git a/modules/beta-private-cluster-update-variant/outputs.tf b/modules/beta-private-cluster-update-variant/outputs.tf
@@ -57,7 +57,6 @@ output "zones" {
 }
 
 output "endpoint" {
-  sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
   depends_on = [
@@ -192,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" {
diff --git a/modules/beta-private-cluster/outputs.tf b/modules/beta-private-cluster/outputs.tf
@@ -57,7 +57,6 @@ output "zones" {
 }
 
 output "endpoint" {
-  sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
   depends_on = [
@@ -192,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" {
diff --git a/modules/beta-public-cluster-update-variant/outputs.tf b/modules/beta-public-cluster-update-variant/outputs.tf
@@ -57,7 +57,6 @@ output "zones" {
 }
 
 output "endpoint" {
-  sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
   depends_on = [
diff --git a/modules/beta-public-cluster/outputs.tf b/modules/beta-public-cluster/outputs.tf
@@ -57,7 +57,6 @@ output "zones" {
 }
 
 output "endpoint" {
-  sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
   depends_on = [
diff --git a/modules/private-cluster-update-variant/outputs.tf b/modules/private-cluster-update-variant/outputs.tf
@@ -57,7 +57,6 @@ output "zones" {
 }
 
 output "endpoint" {
-  sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
   depends_on = [
@@ -192,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" {
diff --git a/modules/private-cluster/outputs.tf b/modules/private-cluster/outputs.tf
@@ -57,7 +57,6 @@ output "zones" {
 }
 
 output "endpoint" {
-  sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
   depends_on = [
@@ -192,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" {
diff --git a/outputs.tf b/outputs.tf
@@ -57,7 +57,6 @@ output "zones" {
 }
 
 output "endpoint" {
-  sensitive   = true
   description = "Cluster endpoint"
   value       = local.cluster_endpoint
   depends_on = [
diff --git a/test/fixtures/autopilot_private_firewalls/outputs.tf b/test/fixtures/autopilot_private_firewalls/outputs.tf
@@ -36,8 +36,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "ca_certificate" {
diff --git a/test/fixtures/beta_cluster/outputs.tf b/test/fixtures/beta_cluster/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.this.kubernetes_endpoint
+  value = module.this.kubernetes_endpoint
 }
 
 output "service_account" {
diff --git a/test/fixtures/deploy_service/outputs.tf b/test/fixtures/deploy_service/outputs.tf
@@ -37,8 +37,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/disable_client_cert/outputs.tf b/test/fixtures/disable_client_cert/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/node_pool/outputs.tf b/test/fixtures/node_pool/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/node_pool_update_variant/outputs.tf b/test/fixtures/node_pool_update_variant/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/private_zonal_with_networking/outputs.tf b/test/fixtures/private_zonal_with_networking/outputs.tf
@@ -29,8 +29,7 @@ output "cluster_name" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/safer_cluster/outputs.tf b/test/fixtures/safer_cluster/outputs.tf
@@ -36,8 +36,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/sandbox_enabled/outputs.tf b/test/fixtures/sandbox_enabled/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/shared_vpc/outputs.tf b/test/fixtures/shared_vpc/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_autopilot_private/outputs.tf b/test/fixtures/simple_autopilot_private/outputs.tf
@@ -36,8 +36,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "ca_certificate" {
diff --git a/test/fixtures/simple_autopilot_public/outputs.tf b/test/fixtures/simple_autopilot_public/outputs.tf
@@ -36,8 +36,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "ca_certificate" {
diff --git a/test/fixtures/simple_regional/outputs.tf b/test/fixtures/simple_regional/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_regional_cluster_autoscaling/outputs.tf b/test/fixtures/simple_regional_cluster_autoscaling/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_regional_private/outputs.tf b/test/fixtures/simple_regional_private/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_regional_private_with_cluster_version/outputs.tf b/test/fixtures/simple_regional_private_with_cluster_version/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_regional_with_gateway_api/outputs.tf b/test/fixtures/simple_regional_with_gateway_api/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_regional_with_ipv6/outputs.tf b/test/fixtures/simple_regional_with_ipv6/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_regional_with_kubeconfig/outputs.tf b/test/fixtures/simple_regional_with_kubeconfig/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_regional_with_networking/outputs.tf b/test/fixtures/simple_regional_with_networking/outputs.tf
@@ -29,8 +29,7 @@ output "cluster_name" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_windows_node_pool/outputs.tf b/test/fixtures/simple_windows_node_pool/outputs.tf
@@ -42,8 +42,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.this.kubernetes_endpoint
+  value = module.this.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_zonal/outputs.tf b/test/fixtures/simple_zonal/outputs.tf
@@ -37,8 +37,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_zonal_private/outputs.tf b/test/fixtures/simple_zonal_private/outputs.tf
@@ -37,8 +37,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/simple_zonal_with_asm/outputs.tf b/test/fixtures/simple_zonal_with_asm/outputs.tf
@@ -60,8 +60,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/stub_domains/outputs.tf b/test/fixtures/stub_domains/outputs.tf
@@ -37,8 +37,7 @@ output "master_kubernetes_version" {
 }
 
 output "kubernetes_endpoint" {
-  sensitive = true
-  value     = module.example.kubernetes_endpoint
+  value = module.example.kubernetes_endpoint
 }
 
 output "client_token" {
diff --git a/test/fixtures/stub_domains_private/outputs.tf b/test/fixtures/stub_domains_private/outputs.tf
diff --git a/test/fixtures/stub_domains_upstream_nameservers/outputs.tf b/test/fixtures/stub_domains_upstream_nameservers/outputs.tf
diff --git a/test/fixtures/upstream_nameservers/outputs.tf b/test/fixtures/upstream_nameservers/outputs.tf
diff --git a/test/fixtures/workload_identity/outputs.tf b/test/fixtures/workload_identity/outputs.tf
diff --git a/test/fixtures/workload_metadata_config/outputs.tf b/test/fixtures/workload_metadata_config/outputs.tf
diff --git a/test/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json b/test/integration/simple_regional_with_gateway_api/testdata/TestSimpleRegionalWithGatewayAPI.json

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ output "zones" {`
`59`	`59`	`}`
`60`	`60`
`61`	`61`	`output "endpoint" {`
`62`		`- sensitive = true`
`63`	`62`	`description = "Cluster endpoint"`
`64`	`63`	`value = local.cluster_endpoint`
`65`	`64`	`depends_on = [`
`@@ -207,7 +206,7 @@ output "mesh_certificates_config" {`
`207`	`206`
`208`	`207`	`output "master_ipv4_cidr_block" {`
`209`	`208`	`description = "The IP range in CIDR notation used for the hosted master network"`
`210`		`- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block`
	`209`	`+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null`
`211`	`210`	`}`
`212`	`211`
`213`	`212`	`output "peering_name" {`
Original file line number	Diff line number	Diff line change
`@@ -15,8 +15,7 @@`
`15`	`15`	`*/`
`16`	`16`
`17`	`17`	`output "kubernetes_endpoint" {`
`18`		`- sensitive = true`
`19`		`- value = module.gke.endpoint`
	`18`	`+ value = module.gke.endpoint`
`20`	`19`	`}`
`21`	`20`
`22`	`21`	`output "client_token" {`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ output "zones" {`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`output "endpoint" {`
`59`		`- sensitive = true`
`60`	`59`	`description = "Cluster endpoint"`
`61`	`60`	`value = local.cluster_endpoint`
`62`	`61`	`depends_on = [`
`@@ -165,7 +164,7 @@ output "tpu_ipv4_cidr_block" {`
`165`	`164`
`166`	`165`	`output "master_ipv4_cidr_block" {`
`167`	`166`	`description = "The IP range in CIDR notation used for the hosted master network"`
`168`		`- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block`
	`167`	`+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null`
`169`	`168`	`}`
`170`	`169`
`171`	`170`	`output "peering_name" {`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,6 @@ output "zones" {`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`output "endpoint" {`
`60`		`- sensitive = true`
`61`	`60`	`description = "Cluster endpoint"`
`62`	`61`	`value = local.cluster_endpoint`
`63`	`62`	`depends_on = [`
`@@ -192,7 +191,7 @@ output "mesh_certificates_config" {`
`192`	`191`
`193`	`192`	`output "master_ipv4_cidr_block" {`
`194`	`193`	`description = "The IP range in CIDR notation used for the hosted master network"`
`195`		`- value = google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block`
	`194`	`+ value = var.enable_private_nodes ? google_container_cluster.primary.private_cluster_config[0].master_ipv4_cidr_block : null`
`196`	`195`	`}`
`197`	`196`
`198`	`197`	`output "peering_name" {`