Fix: dns endpoint for external traffic (#2244)

mmorejon · web-flow · commit 4726ab255795 · 2025-01-24T12:03:35.000-08:00
Signed-off-by: Manuel Morejon &lt;manuel@mmorejon.io&gt;
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -645,7 +645,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "control_plane_endpoints_config" {
-    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]
+    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []
     content {
       dns_endpoint_config {
         allow_external_traffic = var.deploy_using_private_endpoint
diff --git a/examples/safer_cluster_iap_bastion/cluster.tf b/examples/safer_cluster_iap_bastion/cluster.tf
@@ -25,7 +25,7 @@ module "gke" {
   subnetwork              = module.vpc.subnets_names[0]
   ip_range_pods           = module.vpc.subnets_secondary_ranges[0][0].range_name
   ip_range_services       = module.vpc.subnets_secondary_ranges[0][1].range_name
-  enable_private_endpoint = false
+  enable_private_endpoint = true
   deletion_protection     = false
   master_authorized_networks = [{
     cidr_block   = "${module.bastion.ip_address}/32"
diff --git a/modules/beta-autopilot-private-cluster/cluster.tf b/modules/beta-autopilot-private-cluster/cluster.tf
@@ -327,7 +327,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "control_plane_endpoints_config" {
-    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]
+    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []
     content {
       dns_endpoint_config {
         allow_external_traffic = var.deploy_using_private_endpoint
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -554,7 +554,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "control_plane_endpoints_config" {
-    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]
+    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []
     content {
       dns_endpoint_config {
         allow_external_traffic = var.deploy_using_private_endpoint
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -554,7 +554,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "control_plane_endpoints_config" {
-    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]
+    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []
     content {
       dns_endpoint_config {
         allow_external_traffic = var.deploy_using_private_endpoint
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -509,7 +509,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "control_plane_endpoints_config" {
-    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]
+    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []
     content {
       dns_endpoint_config {
         allow_external_traffic = var.deploy_using_private_endpoint
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -509,7 +509,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "control_plane_endpoints_config" {
-    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]
+    for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []
     content {
       dns_endpoint_config {
         allow_external_traffic = var.deploy_using_private_endpoint

Original file line number	Diff line number	Diff line change
`@@ -645,7 +645,7 @@ resource "google_container_cluster" "primary" {`
`645`	`645`	`}`
`646`	`646`
`647`	`647`	`dynamic "control_plane_endpoints_config" {`
`648`		`- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]`
	`648`	`+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []`
`649`	`649`	`content {`
`650`	`650`	`dns_endpoint_config {`
`651`	`651`	`allow_external_traffic = var.deploy_using_private_endpoint`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,7 @@ resource "google_container_cluster" "primary" {`
`327`	`327`	`}`
`328`	`328`
`329`	`329`	`dynamic "control_plane_endpoints_config" {`
`330`		`- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]`
	`330`	`+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []`
`331`	`331`	`content {`
`332`	`332`	`dns_endpoint_config {`
`333`	`333`	`allow_external_traffic = var.deploy_using_private_endpoint`
Original file line number	Diff line number	Diff line change
`@@ -554,7 +554,7 @@ resource "google_container_cluster" "primary" {`
`554`	`554`	`}`
`555`	`555`
`556`	`556`	`dynamic "control_plane_endpoints_config" {`
`557`		`- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]`
	`557`	`+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []`
`558`	`558`	`content {`
`559`	`559`	`dns_endpoint_config {`
`560`	`560`	`allow_external_traffic = var.deploy_using_private_endpoint`
Original file line number	Diff line number	Diff line change
`@@ -509,7 +509,7 @@ resource "google_container_cluster" "primary" {`
`509`	`509`	`}`
`510`	`510`
`511`	`511`	`dynamic "control_plane_endpoints_config" {`
`512`		`- for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : [0]`
	`512`	`+ for_each = var.enable_private_endpoint && var.deploy_using_private_endpoint ? [1] : []`
`513`	`513`	`content {`
`514`	`514`	`dns_endpoint_config {`
`515`	`515`	`allow_external_traffic = var.deploy_using_private_endpoint`