feat(beta-private-cluster):Add possiblity to setup private nodes pool if global configuration is different

buker · buker · commit 925b85704240 · 2025-02-24T11:53:40.000+01:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -876,11 +876,11 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0  ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
       {% if private_cluster %}
-      enable_private_nodes = var.enable_private_nodes
+      enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)
       {% else %}
       enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
       {% endif %}
diff --git a/cluster.tf b/cluster.tf
@@ -595,7 +595,7 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
       enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
@@ -896,7 +896,7 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
       enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -752,10 +752,10 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
-      enable_private_nodes = var.enable_private_nodes
+      enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)
     }
   }
 
@@ -1067,10 +1067,10 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
-      enable_private_nodes = var.enable_private_nodes
+      enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)
     }
   }
 
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -671,10 +671,10 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
-      enable_private_nodes = var.enable_private_nodes
+      enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)
     }
   }
 
@@ -985,10 +985,10 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
-      enable_private_nodes = var.enable_private_nodes
+      enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)
     }
   }
 
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -722,7 +722,7 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
       enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
@@ -1037,7 +1037,7 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
       enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -641,7 +641,7 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
       enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
@@ -955,7 +955,7 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
       enable_private_nodes = lookup(network_config.value, "enable_private_nodes", null)
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -705,10 +705,10 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
-      enable_private_nodes = var.enable_private_nodes
+      enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)
     }
   }
 
@@ -1007,10 +1007,10 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
-      enable_private_nodes = var.enable_private_nodes
+      enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)
     }
   }
 
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -625,10 +625,10 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
-      enable_private_nodes = var.enable_private_nodes
+      enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)
     }
   }
 
@@ -926,10 +926,10 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []
+    for_each = length(lookup(each.value, "pod_range", "")) > 0 || lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []
     content {
       pod_range            = lookup(network_config.value, "pod_range", null)
-      enable_private_nodes = var.enable_private_nodes
+      enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)
     }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -752,10 +752,10 @@ resource "google_container_node_pool" "pools" {`
`752`	`752`	`}`
`753`	`753`
`754`	`754`	`dynamic "network_config" {`
`755`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
	`755`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`756`	`756`	`content {`
`757`	`757`	`pod_range = lookup(network_config.value, "pod_range", null)`
`758`		`- enable_private_nodes = var.enable_private_nodes`
	`758`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`759`	`759`	`}`
`760`	`760`	`}`
`761`	`761`
`@@ -1067,10 +1067,10 @@ resource "google_container_node_pool" "windows_pools" {`
`1067`	`1067`	`}`
`1068`	`1068`
`1069`	`1069`	`dynamic "network_config" {`
`1070`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
	`1070`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`1071`	`1071`	`content {`
`1072`	`1072`	`pod_range = lookup(network_config.value, "pod_range", null)`
`1073`		`- enable_private_nodes = var.enable_private_nodes`
	`1073`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`1074`	`1074`	`}`
`1075`	`1075`	`}`
`1076`	`1076`
Original file line number	Diff line number	Diff line change
`@@ -671,10 +671,10 @@ resource "google_container_node_pool" "pools" {`
`671`	`671`	`}`
`672`	`672`
`673`	`673`	`dynamic "network_config" {`
`674`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
	`674`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`675`	`675`	`content {`
`676`	`676`	`pod_range = lookup(network_config.value, "pod_range", null)`
`677`		`- enable_private_nodes = var.enable_private_nodes`
	`677`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`678`	`678`	`}`
`679`	`679`	`}`
`680`	`680`
`@@ -985,10 +985,10 @@ resource "google_container_node_pool" "windows_pools" {`
`985`	`985`	`}`
`986`	`986`
`987`	`987`	`dynamic "network_config" {`
`988`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
	`988`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`989`	`989`	`content {`
`990`	`990`	`pod_range = lookup(network_config.value, "pod_range", null)`
`991`		`- enable_private_nodes = var.enable_private_nodes`
	`991`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`992`	`992`	`}`
`993`	`993`	`}`
`994`	`994`
Original file line number	Diff line number	Diff line change
`@@ -705,10 +705,10 @@ resource "google_container_node_pool" "pools" {`
`705`	`705`	`}`
`706`	`706`
`707`	`707`	`dynamic "network_config" {`
`708`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
	`708`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`709`	`709`	`content {`
`710`	`710`	`pod_range = lookup(network_config.value, "pod_range", null)`
`711`		`- enable_private_nodes = var.enable_private_nodes`
	`711`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`712`	`712`	`}`
`713`	`713`	`}`
`714`	`714`
`@@ -1007,10 +1007,10 @@ resource "google_container_node_pool" "windows_pools" {`
`1007`	`1007`	`}`
`1008`	`1008`
`1009`	`1009`	`dynamic "network_config" {`
`1010`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
	`1010`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`1011`	`1011`	`content {`
`1012`	`1012`	`pod_range = lookup(network_config.value, "pod_range", null)`
`1013`		`- enable_private_nodes = var.enable_private_nodes`
	`1013`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`1014`	`1014`	`}`
`1015`	`1015`	`}`
`1016`	`1016`
Original file line number	Diff line number	Diff line change
`@@ -625,10 +625,10 @@ resource "google_container_node_pool" "pools" {`
`625`	`625`	`}`
`626`	`626`
`627`	`627`	`dynamic "network_config" {`
`628`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
	`628`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`629`	`629`	`content {`
`630`	`630`	`pod_range = lookup(network_config.value, "pod_range", null)`
`631`		`- enable_private_nodes = var.enable_private_nodes`
	`631`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`632`	`632`	`}`
`633`	`633`	`}`
`634`	`634`
`@@ -926,10 +926,10 @@ resource "google_container_node_pool" "windows_pools" {`
`926`	`926`	`}`
`927`	`927`
`928`	`928`	`dynamic "network_config" {`
`929`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 ? [each.value] : []`
	`929`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`930`	`930`	`content {`
`931`	`931`	`pod_range = lookup(network_config.value, "pod_range", null)`
`932`		`- enable_private_nodes = var.enable_private_nodes`
	`932`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`933`	`933`	`}`
`934`	`934`	`}`
`935`	`935`