Skip to content

Commit 53b1a50

Browse files
DrFaust92apeabody
andauthored
fix: node_pools_cgroup_mode var does not correctly handle the "all" map key (#2224)
Signed-off-by: drfaust92 <[email protected]> Co-authored-by: Andrew Peabody <[email protected]>
1 parent 49478f5 commit 53b1a50

File tree

18 files changed

+42
-21
lines changed

18 files changed

+42
-21
lines changed

autogen/main/cluster.tf.tmpl

+2-1
Original file line numberDiff line numberDiff line change
@@ -1111,6 +1111,7 @@ resource "google_container_node_pool" "windows_pools" {
11111111
for_each = length(merge(
11121112
local.node_pools_linux_node_configs_sysctls["all"],
11131113
local.node_pools_linux_node_configs_sysctls[each.value["name"]],
1114+
local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
11141115
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : {cgroup = local.node_pools_cgroup_mode[each.value["name"]]}
11151116
)) != 0 ? [1] : []
11161117

@@ -1119,7 +1120,7 @@ resource "google_container_node_pool" "windows_pools" {
11191120
local.node_pools_linux_node_configs_sysctls["all"],
11201121
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
11211122
)
1122-
cgroup_mode = local.node_pools_cgroup_mode[each.value["name"]] == "" ? null : local.node_pools_cgroup_mode[each.value["name"]]
1123+
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
11231124
}
11241125
}
11251126
{% endif %}

autogen/main/variables_defaults.tf.tmpl

+9-8
Original file line numberDiff line numberDiff line change
@@ -128,14 +128,15 @@ locals {
128128
),
129129
var.node_pools_linux_node_configs_sysctls
130130
)
131-
node_pools_cgroup_mode = merge(
132-
{ all = "" },
133-
{ default-node-pool = "" },
134-
zipmap(
135-
[for node_pool in var.node_pools : node_pool["name"]],
136-
[for node_pool in var.node_pools : ""]
137-
),
138-
var.node_pools_cgroup_mode
131+
132+
node_pools_cgroup_mode = merge(
133+
{ all = "" },
134+
{ default-node-pool = "" },
135+
zipmap(
136+
[for node_pool in var.node_pools : node_pool["name"]],
137+
[for node_pool in var.node_pools : ""]
138+
),
139+
var.node_pools_cgroup_mode
139140
)
140141
}
141142
{% endif %}

cluster.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -804,6 +804,7 @@ resource "google_container_node_pool" "pools" {
804804
for_each = length(merge(
805805
local.node_pools_linux_node_configs_sysctls["all"],
806806
local.node_pools_linux_node_configs_sysctls[each.value["name"]],
807+
local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
807808
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
808809
)) != 0 ? [1] : []
809810

@@ -812,7 +813,7 @@ resource "google_container_node_pool" "pools" {
812813
local.node_pools_linux_node_configs_sysctls["all"],
813814
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
814815
)
815-
cgroup_mode = local.node_pools_cgroup_mode[each.value["name"]] == "" ? null : local.node_pools_cgroup_mode[each.value["name"]]
816+
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
816817
}
817818
}
818819

examples/node_pool/main.tf

+5
Original file line numberDiff line numberDiff line change
@@ -150,4 +150,9 @@ module "gke" {
150150
"net.core.netdev_max_backlog" = "20000"
151151
}
152152
}
153+
154+
node_pools_cgroup_mode = {
155+
all = "CGROUP_MODE_V1"
156+
pool-01 = "CGROUP_MODE_V2"
157+
}
153158
}

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -975,6 +975,7 @@ resource "google_container_node_pool" "pools" {
975975
for_each = length(merge(
976976
local.node_pools_linux_node_configs_sysctls["all"],
977977
local.node_pools_linux_node_configs_sysctls[each.value["name"]],
978+
local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
978979
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
979980
)) != 0 ? [1] : []
980981

@@ -983,7 +984,7 @@ resource "google_container_node_pool" "pools" {
983984
local.node_pools_linux_node_configs_sysctls["all"],
984985
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
985986
)
986-
cgroup_mode = local.node_pools_cgroup_mode[each.value["name"]] == "" ? null : local.node_pools_cgroup_mode[each.value["name"]]
987+
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
987988
}
988989
}
989990

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

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ locals {
127127
),
128128
var.node_pools_linux_node_configs_sysctls
129129
)
130+
130131
node_pools_cgroup_mode = merge(
131132
{ all = "" },
132133
{ default-node-pool = "" },

modules/beta-private-cluster/cluster.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -894,6 +894,7 @@ resource "google_container_node_pool" "pools" {
894894
for_each = length(merge(
895895
local.node_pools_linux_node_configs_sysctls["all"],
896896
local.node_pools_linux_node_configs_sysctls[each.value["name"]],
897+
local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
897898
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
898899
)) != 0 ? [1] : []
899900

@@ -902,7 +903,7 @@ resource "google_container_node_pool" "pools" {
902903
local.node_pools_linux_node_configs_sysctls["all"],
903904
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
904905
)
905-
cgroup_mode = local.node_pools_cgroup_mode[each.value["name"]] == "" ? null : local.node_pools_cgroup_mode[each.value["name"]]
906+
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
906907
}
907908
}
908909

modules/beta-private-cluster/variables_defaults.tf

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ locals {
127127
),
128128
var.node_pools_linux_node_configs_sysctls
129129
)
130+
130131
node_pools_cgroup_mode = merge(
131132
{ all = "" },
132133
{ default-node-pool = "" },

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -945,6 +945,7 @@ resource "google_container_node_pool" "pools" {
945945
for_each = length(merge(
946946
local.node_pools_linux_node_configs_sysctls["all"],
947947
local.node_pools_linux_node_configs_sysctls[each.value["name"]],
948+
local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
948949
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
949950
)) != 0 ? [1] : []
950951

@@ -953,7 +954,7 @@ resource "google_container_node_pool" "pools" {
953954
local.node_pools_linux_node_configs_sysctls["all"],
954955
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
955956
)
956-
cgroup_mode = local.node_pools_cgroup_mode[each.value["name"]] == "" ? null : local.node_pools_cgroup_mode[each.value["name"]]
957+
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
957958
}
958959
}
959960

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

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ locals {
127127
),
128128
var.node_pools_linux_node_configs_sysctls
129129
)
130+
130131
node_pools_cgroup_mode = merge(
131132
{ all = "" },
132133
{ default-node-pool = "" },

modules/beta-public-cluster/cluster.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -864,6 +864,7 @@ resource "google_container_node_pool" "pools" {
864864
for_each = length(merge(
865865
local.node_pools_linux_node_configs_sysctls["all"],
866866
local.node_pools_linux_node_configs_sysctls[each.value["name"]],
867+
local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
867868
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
868869
)) != 0 ? [1] : []
869870

@@ -872,7 +873,7 @@ resource "google_container_node_pool" "pools" {
872873
local.node_pools_linux_node_configs_sysctls["all"],
873874
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
874875
)
875-
cgroup_mode = local.node_pools_cgroup_mode[each.value["name"]] == "" ? null : local.node_pools_cgroup_mode[each.value["name"]]
876+
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
876877
}
877878
}
878879

modules/beta-public-cluster/variables_defaults.tf

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ locals {
127127
),
128128
var.node_pools_linux_node_configs_sysctls
129129
)
130+
130131
node_pools_cgroup_mode = merge(
131132
{ all = "" },
132133
{ default-node-pool = "" },

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

+2-1
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,7 @@ resource "google_container_node_pool" "pools" {
914914
for_each = length(merge(
915915
local.node_pools_linux_node_configs_sysctls["all"],
916916
local.node_pools_linux_node_configs_sysctls[each.value["name"]],
917+
local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
917918
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
918919
)) != 0 ? [1] : []
919920

@@ -922,7 +923,7 @@ resource "google_container_node_pool" "pools" {
922923
local.node_pools_linux_node_configs_sysctls["all"],
923924
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
924925
)
925-
cgroup_mode = local.node_pools_cgroup_mode[each.value["name"]] == "" ? null : local.node_pools_cgroup_mode[each.value["name"]]
926+
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
926927
}
927928
}
928929

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

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ locals {
127127
),
128128
var.node_pools_linux_node_configs_sysctls
129129
)
130+
130131
node_pools_cgroup_mode = merge(
131132
{ all = "" },
132133
{ default-node-pool = "" },

modules/private-cluster/cluster.tf

+2-1
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,7 @@ resource "google_container_node_pool" "pools" {
834834
for_each = length(merge(
835835
local.node_pools_linux_node_configs_sysctls["all"],
836836
local.node_pools_linux_node_configs_sysctls[each.value["name"]],
837+
local.node_pools_cgroup_mode["all"] == "" ? {} : { cgroup = local.node_pools_cgroup_mode["all"] },
837838
local.node_pools_cgroup_mode[each.value["name"]] == "" ? {} : { cgroup = local.node_pools_cgroup_mode[each.value["name"]] }
838839
)) != 0 ? [1] : []
839840

@@ -842,7 +843,7 @@ resource "google_container_node_pool" "pools" {
842843
local.node_pools_linux_node_configs_sysctls["all"],
843844
local.node_pools_linux_node_configs_sysctls[each.value["name"]]
844845
)
845-
cgroup_mode = local.node_pools_cgroup_mode[each.value["name"]] == "" ? null : local.node_pools_cgroup_mode[each.value["name"]]
846+
cgroup_mode = coalesce(local.node_pools_cgroup_mode[each.value["name"]], local.node_pools_cgroup_mode["all"], null)
846847
}
847848
}
848849

modules/private-cluster/variables_defaults.tf

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ locals {
127127
),
128128
var.node_pools_linux_node_configs_sysctls
129129
)
130+
130131
node_pools_cgroup_mode = merge(
131132
{ all = "" },
132133
{ default-node-pool = "" },

test/integration/node_pool/testdata/TestNodePool.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,7 @@
270270
"config": {
271271
"diskSizeGb": 100,
272272
"diskType": "pd-standard",
273-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
273+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
274274
"imageType": "COS_CONTAINERD",
275275
"machineType": "e2-medium",
276276
"metadata": {
@@ -425,7 +425,7 @@
425425
],
426426
"diskSizeGb": 30,
427427
"diskType": "pd-standard",
428-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
428+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
429429
"imageType": "COS_CONTAINERD",
430430
"labels": {
431431
"all-pools-example": "true",
@@ -505,7 +505,7 @@
505505
"config": {
506506
"diskSizeGb": 100,
507507
"diskType": "pd-standard",
508-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
508+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
509509
"imageType": "COS_CONTAINERD",
510510
"kubeletConfig": {
511511
"cpuCfsQuota": true,
@@ -603,7 +603,7 @@
603603
"config": {
604604
"diskSizeGb": 100,
605605
"diskType": "pd-standard",
606-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
606+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
607607
"imageType": "COS_CONTAINERD",
608608
"labels": {
609609
"all-pools-example": "true",
@@ -698,7 +698,7 @@
698698
},
699699
"diskSizeGb": 100,
700700
"diskType": "pd-standard",
701-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
701+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
702702
"imageType": "COS_CONTAINERD",
703703
"labels": {
704704
"all-pools-example": "true",

variables_defaults.tf

+1
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,7 @@ locals {
127127
),
128128
var.node_pools_linux_node_configs_sysctls
129129
)
130+
130131
node_pools_cgroup_mode = merge(
131132
{ all = "" },
132133
{ default-node-pool = "" },

0 commit comments

Comments
 (0)