Skip to content

Commit 6148cb7

Browse files
Dutta78Dutta78
authored
fix: wrap cgroup_mode coalesce with try() to handle empty values (#2396)
1 parent 1859b17 commit 6148cb7

File tree

8 files changed

+8
-8
lines changed

8 files changed

+8
-8
lines changed

‎autogen/main/cluster.tf.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1253,7 +1253,7 @@ resource "google_container_node_pool" "windows_pools" {
12531253
local.node_pools_linux_node_configs_sysctls["all"],
12541254
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
12551255
)
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)
12571257
dynamic "hugepages_config" {
12581258
for_each = length(merge(
12591259
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },

‎cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ resource "google_container_node_pool" "pools" {
941941
local.node_pools_linux_node_configs_sysctls["all"],
942942
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
943943
)
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)
945945
dynamic "hugepages_config" {
946946
for_each = length(merge(
947947
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1104,7 +1104,7 @@ resource "google_container_node_pool" "pools" {
11041104
local.node_pools_linux_node_configs_sysctls["all"],
11051105
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
11061106
)
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)
11081108
dynamic "hugepages_config" {
11091109
for_each = length(merge(
11101110
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1021,7 +1021,7 @@ resource "google_container_node_pool" "pools" {
10211021
local.node_pools_linux_node_configs_sysctls["all"],
10221022
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
10231023
)
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)
10251025
dynamic "hugepages_config" {
10261026
for_each = length(merge(
10271027
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1082,7 +1082,7 @@ resource "google_container_node_pool" "pools" {
10821082
local.node_pools_linux_node_configs_sysctls["all"],
10831083
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
10841084
)
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)
10861086
dynamic "hugepages_config" {
10871087
for_each = length(merge(
10881088
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -999,7 +999,7 @@ resource "google_container_node_pool" "pools" {
999999
local.node_pools_linux_node_configs_sysctls["all"],
10001000
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
10011001
)
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)
10031003
dynamic "hugepages_config" {
10041004
for_each = length(merge(
10051005
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1045,7 +1045,7 @@ resource "google_container_node_pool" "pools" {
10451045
local.node_pools_linux_node_configs_sysctls["all"],
10461046
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
10471047
)
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)
10491049
dynamic "hugepages_config" {
10501050
for_each = length(merge(
10511051
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },

‎modules/private-cluster/cluster.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ resource "google_container_node_pool" "pools" {
963963
local.node_pools_linux_node_configs_sysctls["all"],
964964
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
965965
)
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)
967967
dynamic "hugepages_config" {
968968
for_each = length(merge(
969969
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },

0 commit comments

Comments
 (0)