feat: Add possibility to setup private nodes pool if global configuration is different (#2290)

buker · web-flow · commit aadc8605be10 · 2025-03-03T16:59:04.000-08:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -898,11 +898,11 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 || {% if private_cluster %}var.enable_private_nodes != null{% else %}lookup(each.value, "enable_private_nodes", null) != null{% endif %} ? [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/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -774,10 +774,10 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [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)
     }
   }
 
@@ -1104,10 +1104,10 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [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
@@ -693,10 +693,10 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [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)
     }
   }
 
@@ -1022,10 +1022,10 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [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-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -727,10 +727,10 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [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)
     }
   }
 
@@ -1044,10 +1044,10 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [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
@@ -647,10 +647,10 @@ resource "google_container_node_pool" "pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [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)
     }
   }
 
@@ -963,10 +963,10 @@ resource "google_container_node_pool" "windows_pools" {
   }
 
   dynamic "network_config" {
-    for_each = length(lookup(each.value, "pod_range", "")) > 0 || var.enable_private_nodes != null ? [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
`@@ -774,10 +774,10 @@ resource "google_container_node_pool" "pools" {`
`774`	`774`	`}`
`775`	`775`
`776`	`776`	`dynamic "network_config" {`
`777`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| var.enable_private_nodes != null ? [each.value] : []`
	`777`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`778`	`778`	`content {`
`779`	`779`	`pod_range = lookup(network_config.value, "pod_range", null)`
`780`		`- enable_private_nodes = var.enable_private_nodes`
	`780`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`781`	`781`	`}`
`782`	`782`	`}`
`783`	`783`
`@@ -1104,10 +1104,10 @@ resource "google_container_node_pool" "windows_pools" {`
`1104`	`1104`	`}`
`1105`	`1105`
`1106`	`1106`	`dynamic "network_config" {`
`1107`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| var.enable_private_nodes != null ? [each.value] : []`
	`1107`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`1108`	`1108`	`content {`
`1109`	`1109`	`pod_range = lookup(network_config.value, "pod_range", null)`
`1110`		`- enable_private_nodes = var.enable_private_nodes`
	`1110`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`1111`	`1111`	`}`
`1112`	`1112`	`}`
`1113`	`1113`
Original file line number	Diff line number	Diff line change
`@@ -693,10 +693,10 @@ resource "google_container_node_pool" "pools" {`
`693`	`693`	`}`
`694`	`694`
`695`	`695`	`dynamic "network_config" {`
`696`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| var.enable_private_nodes != null ? [each.value] : []`
	`696`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`697`	`697`	`content {`
`698`	`698`	`pod_range = lookup(network_config.value, "pod_range", null)`
`699`		`- enable_private_nodes = var.enable_private_nodes`
	`699`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`700`	`700`	`}`
`701`	`701`	`}`
`702`	`702`
`@@ -1022,10 +1022,10 @@ resource "google_container_node_pool" "windows_pools" {`
`1022`	`1022`	`}`
`1023`	`1023`
`1024`	`1024`	`dynamic "network_config" {`
`1025`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| var.enable_private_nodes != null ? [each.value] : []`
	`1025`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`1026`	`1026`	`content {`
`1027`	`1027`	`pod_range = lookup(network_config.value, "pod_range", null)`
`1028`		`- enable_private_nodes = var.enable_private_nodes`
	`1028`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`1029`	`1029`	`}`
`1030`	`1030`	`}`
`1031`	`1031`
Original file line number	Diff line number	Diff line change
`@@ -727,10 +727,10 @@ resource "google_container_node_pool" "pools" {`
`727`	`727`	`}`
`728`	`728`
`729`	`729`	`dynamic "network_config" {`
`730`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| var.enable_private_nodes != null ? [each.value] : []`
	`730`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`731`	`731`	`content {`
`732`	`732`	`pod_range = lookup(network_config.value, "pod_range", null)`
`733`		`- enable_private_nodes = var.enable_private_nodes`
	`733`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`734`	`734`	`}`
`735`	`735`	`}`
`736`	`736`
`@@ -1044,10 +1044,10 @@ resource "google_container_node_pool" "windows_pools" {`
`1044`	`1044`	`}`
`1045`	`1045`
`1046`	`1046`	`dynamic "network_config" {`
`1047`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| var.enable_private_nodes != null ? [each.value] : []`
	`1047`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`1048`	`1048`	`content {`
`1049`	`1049`	`pod_range = lookup(network_config.value, "pod_range", null)`
`1050`		`- enable_private_nodes = var.enable_private_nodes`
	`1050`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`1051`	`1051`	`}`
`1052`	`1052`	`}`
`1053`	`1053`
Original file line number	Diff line number	Diff line change
`@@ -647,10 +647,10 @@ resource "google_container_node_pool" "pools" {`
`647`	`647`	`}`
`648`	`648`
`649`	`649`	`dynamic "network_config" {`
`650`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| var.enable_private_nodes != null ? [each.value] : []`
	`650`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`651`	`651`	`content {`
`652`	`652`	`pod_range = lookup(network_config.value, "pod_range", null)`
`653`		`- enable_private_nodes = var.enable_private_nodes`
	`653`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`654`	`654`	`}`
`655`	`655`	`}`
`656`	`656`
`@@ -963,10 +963,10 @@ resource "google_container_node_pool" "windows_pools" {`
`963`	`963`	`}`
`964`	`964`
`965`	`965`	`dynamic "network_config" {`
`966`		`- for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| var.enable_private_nodes != null ? [each.value] : []`
	`966`	`+ for_each = length(lookup(each.value, "pod_range", "")) > 0 \|\| lookup(each.value, "enable_private_nodes", null) != null ? [each.value] : []`
`967`	`967`	`content {`
`968`	`968`	`pod_range = lookup(network_config.value, "pod_range", null)`
`969`		`- enable_private_nodes = var.enable_private_nodes`
	`969`	`+ enable_private_nodes = lookup(network_config.value, "enable_private_nodes", var.enable_private_nodes)`
`970`	`970`	`}`
`971`	`971`	`}`
`972`	`972`