provide backward compatbility

Author: apeabody

autogen/main/cluster.tf.tmpl

@@ -666,12 +666,13 @@ resource "google_container_cluster" "primary" {
     }
   }
 
+# TODO: Migrate to only dns_allow_external_traffic in next breaking release
 {% endif %}
   dynamic "control_plane_endpoints_config" {
-    for_each = var.dns_allow_external_traffic != null ? [1] : []
+    for_each = var.dns_allow_external_traffic != null {% if private_cluster %}|| (var.enable_private_endpoint && var.deploy_using_private_endpoint) {% endif %}? [1] : []
     content {
       dns_endpoint_config {
-        allow_external_traffic = var.dns_allow_external_traffic
+        allow_external_traffic = (var.dns_allow_external_traffic{% if private_cluster %} || var.deploy_using_private_endpoint {% endif %})
       }
     }
   }

cluster.tf

@@ -512,7 +512,7 @@ resource "google_container_cluster" "primary" {
     for_each = var.dns_allow_external_traffic != null ? [1] : []
     content {
       dns_endpoint_config {
-        allow_external_traffic = var.dns_allow_external_traffic
+        allow_external_traffic = (var.dns_allow_external_traffic)
       }
     }
   }

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

@@ -333,11 +333,12 @@ resource "google_container_cluster" "primary" {
     }
   }
 
+  # TODO: Migrate to only dns_allow_external_traffic in next breaking release
   dynamic "control_plane_endpoints_config" {
-    for_each = var.dns_allow_external_traffic != null ? [1] : []
+    for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []
     content {
       dns_endpoint_config {
-        allow_external_traffic = var.dns_allow_external_traffic
+        allow_external_traffic = (var.dns_allow_external_traffic || var.deploy_using_private_endpoint)
       }
     }
   }

modules/beta-autopilot-public-cluster/cluster.tf

@@ -315,7 +315,7 @@ resource "google_container_cluster" "primary" {
     for_each = var.dns_allow_external_traffic != null ? [1] : []
     content {
       dns_endpoint_config {
-        allow_external_traffic = var.dns_allow_external_traffic
+        allow_external_traffic = (var.dns_allow_external_traffic)
       }
     }
   }

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

@@ -575,11 +575,12 @@ resource "google_container_cluster" "primary" {
     }
   }
 
+  # TODO: Migrate to only dns_allow_external_traffic in next breaking release
   dynamic "control_plane_endpoints_config" {
-    for_each = var.dns_allow_external_traffic != null ? [1] : []
+    for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []
     content {
       dns_endpoint_config {
-        allow_external_traffic = var.dns_allow_external_traffic
+        allow_external_traffic = (var.dns_allow_external_traffic || var.deploy_using_private_endpoint)
       }
     }
   }

modules/beta-private-cluster/cluster.tf

@@ -575,11 +575,12 @@ resource "google_container_cluster" "primary" {
     }
   }
 
+  # TODO: Migrate to only dns_allow_external_traffic in next breaking release
   dynamic "control_plane_endpoints_config" {
-    for_each = var.dns_allow_external_traffic != null ? [1] : []
+    for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []
     content {
       dns_endpoint_config {
-        allow_external_traffic = var.dns_allow_external_traffic
+        allow_external_traffic = (var.dns_allow_external_traffic || var.deploy_using_private_endpoint)
       }
     }
   }

modules/beta-public-cluster-update-variant/cluster.tf

@@ -557,7 +557,7 @@ resource "google_container_cluster" "primary" {
     for_each = var.dns_allow_external_traffic != null ? [1] : []
     content {
       dns_endpoint_config {
-        allow_external_traffic = var.dns_allow_external_traffic
+        allow_external_traffic = (var.dns_allow_external_traffic)
       }
     }
   }

modules/beta-public-cluster/cluster.tf

@@ -557,7 +557,7 @@ resource "google_container_cluster" "primary" {
     for_each = var.dns_allow_external_traffic != null ? [1] : []
     content {
       dns_endpoint_config {
-        allow_external_traffic = var.dns_allow_external_traffic
+        allow_external_traffic = (var.dns_allow_external_traffic)
       }
     }
   }

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

@@ -530,11 +530,12 @@ resource "google_container_cluster" "primary" {
     }
   }
 
+  # TODO: Migrate to only dns_allow_external_traffic in next breaking release
   dynamic "control_plane_endpoints_config" {
-    for_each = var.dns_allow_external_traffic != null ? [1] : []
+    for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []
     content {
       dns_endpoint_config {
-        allow_external_traffic = var.dns_allow_external_traffic
+        allow_external_traffic = (var.dns_allow_external_traffic || var.deploy_using_private_endpoint)
       }
     }
   }

modules/private-cluster/cluster.tf

@@ -530,11 +530,12 @@ resource "google_container_cluster" "primary" {
     }
   }
 
+  # TODO: Migrate to only dns_allow_external_traffic in next breaking release
   dynamic "control_plane_endpoints_config" {
-    for_each = var.dns_allow_external_traffic != null ? [1] : []
+    for_each = var.dns_allow_external_traffic != null || (var.enable_private_endpoint && var.deploy_using_private_endpoint) ? [1] : []
     content {
       dns_endpoint_config {
-        allow_external_traffic = var.dns_allow_external_traffic
+        allow_external_traffic = (var.dns_allow_external_traffic || var.deploy_using_private_endpoint)
       }
     }
   }