fix: wrap cgroup_mode coalesce with try() to handle empty values (#2396)

Dutta78 · web-flow · commit 6148cb7c9f15 · 2025-08-07T15:16:16.000-07:00
diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -1253,7 +1253,7 @@ resource "google_container_node_pool" "windows_pools" {
           local.node_pools_linux_node_configs_sysctls["all"],
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
-        cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+        cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
         dynamic "hugepages_config" {
           for_each = length(merge(
             local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
diff --git a/cluster.tf b/cluster.tf
@@ -941,7 +941,7 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls["all"],
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
-        cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+        cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
         dynamic "hugepages_config" {
           for_each = length(merge(
             local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -1104,7 +1104,7 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls["all"],
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
-        cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+        cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
         dynamic "hugepages_config" {
           for_each = length(merge(
             local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -1021,7 +1021,7 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls["all"],
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
-        cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+        cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
         dynamic "hugepages_config" {
           for_each = length(merge(
             local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -1082,7 +1082,7 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls["all"],
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
-        cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+        cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
         dynamic "hugepages_config" {
           for_each = length(merge(
             local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
diff --git a/modules/beta-public-cluster/cluster.tf b/modules/beta-public-cluster/cluster.tf
@@ -999,7 +999,7 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls["all"],
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
-        cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+        cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
         dynamic "hugepages_config" {
           for_each = length(merge(
             local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
diff --git a/modules/private-cluster-update-variant/cluster.tf b/modules/private-cluster-update-variant/cluster.tf
@@ -1045,7 +1045,7 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls["all"],
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
-        cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+        cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
         dynamic "hugepages_config" {
           for_each = length(merge(
             local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },
diff --git a/modules/private-cluster/cluster.tf b/modules/private-cluster/cluster.tf
@@ -963,7 +963,7 @@ resource "google_container_node_pool" "pools" {
           local.node_pools_linux_node_configs_sysctls["all"],
           local.node_pools_linux_node_configs_sysctls[each.value["name"]]
         )
-        cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
+        cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
         dynamic "hugepages_config" {
           for_each = length(merge(
             local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },

Original file line number	Diff line number	Diff line change
`@@ -1253,7 +1253,7 @@ resource "google_container_node_pool" "windows_pools" {`
`1253`	`1253`	`local.node_pools_linux_node_configs_sysctls["all"],`
`1254`	`1254`	`local.node_pools_linux_node_configs_sysctls[each.value["name"]]`
`1255`	`1255`	`)`
`1256`		`- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)`
	`1256`	`+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)`
`1257`	`1257`	`dynamic "hugepages_config" {`
`1258`	`1258`	`for_each = length(merge(`
`1259`	`1259`	`local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },`
Original file line number	Diff line number	Diff line change
`@@ -941,7 +941,7 @@ resource "google_container_node_pool" "pools" {`
`941`	`941`	`local.node_pools_linux_node_configs_sysctls["all"],`
`942`	`942`	`local.node_pools_linux_node_configs_sysctls[each.value["name"]]`
`943`	`943`	`)`
`944`		`- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)`
	`944`	`+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)`
`945`	`945`	`dynamic "hugepages_config" {`
`946`	`946`	`for_each = length(merge(`
`947`	`947`	`local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },`
Original file line number	Diff line number	Diff line change
`@@ -1104,7 +1104,7 @@ resource "google_container_node_pool" "pools" {`
`1104`	`1104`	`local.node_pools_linux_node_configs_sysctls["all"],`
`1105`	`1105`	`local.node_pools_linux_node_configs_sysctls[each.value["name"]]`
`1106`	`1106`	`)`
`1107`		`- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)`
	`1107`	`+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)`
`1108`	`1108`	`dynamic "hugepages_config" {`
`1109`	`1109`	`for_each = length(merge(`
`1110`	`1110`	`local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },`
Original file line number	Diff line number	Diff line change
`@@ -1021,7 +1021,7 @@ resource "google_container_node_pool" "pools" {`
`1021`	`1021`	`local.node_pools_linux_node_configs_sysctls["all"],`
`1022`	`1022`	`local.node_pools_linux_node_configs_sysctls[each.value["name"]]`
`1023`	`1023`	`)`
`1024`		`- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)`
	`1024`	`+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)`
`1025`	`1025`	`dynamic "hugepages_config" {`
`1026`	`1026`	`for_each = length(merge(`
`1027`	`1027`	`local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },`
Original file line number	Diff line number	Diff line change
`@@ -1082,7 +1082,7 @@ resource "google_container_node_pool" "pools" {`
`1082`	`1082`	`local.node_pools_linux_node_configs_sysctls["all"],`
`1083`	`1083`	`local.node_pools_linux_node_configs_sysctls[each.value["name"]]`
`1084`	`1084`	`)`
`1085`		`- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)`
	`1085`	`+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)`
`1086`	`1086`	`dynamic "hugepages_config" {`
`1087`	`1087`	`for_each = length(merge(`
`1088`	`1088`	`local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },`
Original file line number	Diff line number	Diff line change
`@@ -999,7 +999,7 @@ resource "google_container_node_pool" "pools" {`
`999`	`999`	`local.node_pools_linux_node_configs_sysctls["all"],`
`1000`	`1000`	`local.node_pools_linux_node_configs_sysctls[each.value["name"]]`
`1001`	`1001`	`)`
`1002`		`- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)`
	`1002`	`+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)`
`1003`	`1003`	`dynamic "hugepages_config" {`
`1004`	`1004`	`for_each = length(merge(`
`1005`	`1005`	`local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },`
Original file line number	Diff line number	Diff line change
`@@ -1045,7 +1045,7 @@ resource "google_container_node_pool" "pools" {`
`1045`	`1045`	`local.node_pools_linux_node_configs_sysctls["all"],`
`1046`	`1046`	`local.node_pools_linux_node_configs_sysctls[each.value["name"]]`
`1047`	`1047`	`)`
`1048`		`- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)`
	`1048`	`+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)`
`1049`	`1049`	`dynamic "hugepages_config" {`
`1050`	`1050`	`for_each = length(merge(`
`1051`	`1051`	`local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },`
Original file line number	Diff line number	Diff line change
`@@ -963,7 +963,7 @@ resource "google_container_node_pool" "pools" {`
`963`	`963`	`local.node_pools_linux_node_configs_sysctls["all"],`
`964`	`964`	`local.node_pools_linux_node_configs_sysctls[each.value["name"]]`
`965`	`965`	`)`
`966`		`- cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)`
	`966`	`+ cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)`
`967`	`967`	`dynamic "hugepages_config" {`
`968`	`968`	`for_each = length(merge(`
`969`	`969`	`local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },`