Skip to content

Commit f584f0a

Browse files
apeabodyapeabody
authored
Merge branch 'main' into gke-patch
2 parents 43af1fa + 6148cb7 commit f584f0a

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
@@ -1261,7 +1261,7 @@ resource "google_container_node_pool" "windows_pools" {
12611261
local.node_pools_linux_node_configs_sysctls["all"],
12621262
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
12631263
)
1264-
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
1264+
cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
12651265
dynamic "hugepages_config" {
12661266
for_each = length(merge(
12671267
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
@@ -949,7 +949,7 @@ resource "google_container_node_pool" "pools" {
949949
local.node_pools_linux_node_configs_sysctls["all"],
950950
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
951951
)
952-
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
952+
cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
953953
dynamic "hugepages_config" {
954954
for_each = length(merge(
955955
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
@@ -1112,7 +1112,7 @@ resource "google_container_node_pool" "pools" {
11121112
local.node_pools_linux_node_configs_sysctls["all"],
11131113
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
11141114
)
1115-
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
1115+
cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
11161116
dynamic "hugepages_config" {
11171117
for_each = length(merge(
11181118
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
@@ -1029,7 +1029,7 @@ resource "google_container_node_pool" "pools" {
10291029
local.node_pools_linux_node_configs_sysctls["all"],
10301030
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
10311031
)
1032-
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
1032+
cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
10331033
dynamic "hugepages_config" {
10341034
for_each = length(merge(
10351035
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
@@ -1090,7 +1090,7 @@ resource "google_container_node_pool" "pools" {
10901090
local.node_pools_linux_node_configs_sysctls["all"],
10911091
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
10921092
)
1093-
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
1093+
cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
10941094
dynamic "hugepages_config" {
10951095
for_each = length(merge(
10961096
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
@@ -1007,7 +1007,7 @@ resource "google_container_node_pool" "pools" {
10071007
local.node_pools_linux_node_configs_sysctls["all"],
10081008
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
10091009
)
1010-
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
1010+
cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
10111011
dynamic "hugepages_config" {
10121012
for_each = length(merge(
10131013
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
@@ -1053,7 +1053,7 @@ resource "google_container_node_pool" "pools" {
10531053
local.node_pools_linux_node_configs_sysctls["all"],
10541054
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
10551055
)
1056-
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
1056+
cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
10571057
dynamic "hugepages_config" {
10581058
for_each = length(merge(
10591059
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
@@ -971,7 +971,7 @@ resource "google_container_node_pool" "pools" {
971971
local.node_pools_linux_node_configs_sysctls["all"],
972972
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
973973
)
974-
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
974+
cgroup_mode = try(coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"]), null)
975975
dynamic "hugepages_config" {
976976
for_each = length(merge(
977977
local.node_pools_hugepage_size_2m["all"] == "" ? {} : { cgroup = local.node_pools_hugepage_size_2m["all"] },

0 commit comments

Comments
 (0)