fix: apply all valid configurations for cluster_dns_provider (#1805)

terraform-google-modules · Jan 24, 2025 · c7faa01 · c7faa01
1 parent 1c08b99
commit c7faa01
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 8 deletions.
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -492,7 +492,7 @@ resource "google_container_cluster" "primary" {
 
   {% if autopilot_cluster != true %}
   dynamic "dns_config" {
-    for_each = var.cluster_dns_provider == "CLOUD_DNS" ? [1] : []
+    for_each = !(var.cluster_dns_provider == "PROVIDER_UNSPECIFIED" && var.cluster_dns_scope == "DNS_SCOPE_UNSPECIFIED" && var.cluster_dns_domain == "" ) ? [1] : []
     content {
       additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain
       cluster_dns                   = var.cluster_dns_provider

diff --git a/cluster.tf b/cluster.tf
@@ -377,7 +377,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "dns_config" {
-    for_each = var.cluster_dns_provider == "CLOUD_DNS" ? [1] : []
+    for_each = !(var.cluster_dns_provider == "PROVIDER_UNSPECIFIED" && var.cluster_dns_scope == "DNS_SCOPE_UNSPECIFIED" && var.cluster_dns_domain == "") ? [1] : []
     content {
       additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain
       cluster_dns                   = var.cluster_dns_provider

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -414,7 +414,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "dns_config" {
-    for_each = var.cluster_dns_provider == "CLOUD_DNS" ? [1] : []
+    for_each = !(var.cluster_dns_provider == "PROVIDER_UNSPECIFIED" && var.cluster_dns_scope == "DNS_SCOPE_UNSPECIFIED" && var.cluster_dns_domain == "") ? [1] : []
     content {
       additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain
       cluster_dns                   = var.cluster_dns_provider

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -414,7 +414,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "dns_config" {
-    for_each = var.cluster_dns_provider == "CLOUD_DNS" ? [1] : []
+    for_each = !(var.cluster_dns_provider == "PROVIDER_UNSPECIFIED" && var.cluster_dns_scope == "DNS_SCOPE_UNSPECIFIED" && var.cluster_dns_domain == "") ? [1] : []
     content {
       additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain
       cluster_dns                   = var.cluster_dns_provider

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -414,7 +414,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "dns_config" {
-    for_each = var.cluster_dns_provider == "CLOUD_DNS" ? [1] : []
+    for_each = !(var.cluster_dns_provider == "PROVIDER_UNSPECIFIED" && var.cluster_dns_scope == "DNS_SCOPE_UNSPECIFIED" && var.cluster_dns_domain == "") ? [1] : []
     content {
       additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain
       cluster_dns                   = var.cluster_dns_provider

diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -414,7 +414,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "dns_config" {
-    for_each = var.cluster_dns_provider == "CLOUD_DNS" ? [1] : []
+    for_each = !(var.cluster_dns_provider == "PROVIDER_UNSPECIFIED" && var.cluster_dns_scope == "DNS_SCOPE_UNSPECIFIED" && var.cluster_dns_domain == "") ? [1] : []
     content {
       additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain
       cluster_dns                   = var.cluster_dns_provider

diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -377,7 +377,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "dns_config" {
-    for_each = var.cluster_dns_provider == "CLOUD_DNS" ? [1] : []
+    for_each = !(var.cluster_dns_provider == "PROVIDER_UNSPECIFIED" && var.cluster_dns_scope == "DNS_SCOPE_UNSPECIFIED" && var.cluster_dns_domain == "") ? [1] : []
     content {
       additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain
       cluster_dns                   = var.cluster_dns_provider

diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -377,7 +377,7 @@ resource "google_container_cluster" "primary" {
   }
 
   dynamic "dns_config" {
-    for_each = var.cluster_dns_provider == "CLOUD_DNS" ? [1] : []
+    for_each = !(var.cluster_dns_provider == "PROVIDER_UNSPECIFIED" && var.cluster_dns_scope == "DNS_SCOPE_UNSPECIFIED" && var.cluster_dns_domain == "") ? [1] : []
     content {
       additive_vpc_scope_dns_domain = var.additive_vpc_scope_dns_domain
       cluster_dns                   = var.cluster_dns_provider