Skip to content

Commit eeaf95d

Browse files
davidholsgrovedavidholsgrove
authored
fix: Add the nodepool cgroup mode to the NAP config (#2356)
1 parent 090781d commit eeaf95d

File tree

10 files changed

+113
-33
lines changed

10 files changed

+113
-33
lines changed

‎autogen/main/cluster.tf.tmpl‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -356,10 +356,20 @@ resource "google_container_cluster" "primary" {
356356

357357
{% if autopilot_cluster != true %}
358358
dynamic "node_pool_auto_config" {
359-
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
359+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
360360
content {
361-
network_tags {
362-
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
361+
dynamic "network_tags" {
362+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
363+
content {
364+
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
365+
}
366+
}
367+
368+
dynamic "linux_node_config" {
369+
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
370+
content {
371+
cgroup_mode = local.node_pools_cgroup_mode["all"]
372+
}
363373
}
364374
}
365375
}

‎cluster.tf‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,20 @@ resource "google_container_cluster" "primary" {
265265
}
266266

267267
dynamic "node_pool_auto_config" {
268-
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
268+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
269269
content {
270-
network_tags {
271-
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
270+
dynamic "network_tags" {
271+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
272+
content {
273+
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
274+
}
275+
}
276+
277+
dynamic "linux_node_config" {
278+
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
279+
content {
280+
cgroup_mode = local.node_pools_cgroup_mode["all"]
281+
}
272282
}
273283
}
274284
}

‎examples/node_pool/main.tf‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,8 +163,8 @@ module "gke" {
163163
}
164164

165165
node_pools_cgroup_mode = {
166-
all = "CGROUP_MODE_V1"
167-
pool-01 = "CGROUP_MODE_V2"
166+
all = "CGROUP_MODE_V2"
167+
pool-01 = "CGROUP_MODE_V1"
168168
}
169169

170170
node_pools_hugepage_size_2m = {

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,20 @@ resource "google_container_cluster" "primary" {
278278
}
279279

280280
dynamic "node_pool_auto_config" {
281-
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
281+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
282282
content {
283-
network_tags {
284-
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
283+
dynamic "network_tags" {
284+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
285+
content {
286+
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
287+
}
288+
}
289+
290+
dynamic "linux_node_config" {
291+
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
292+
content {
293+
cgroup_mode = local.node_pools_cgroup_mode["all"]
294+
}
285295
}
286296
}
287297
}

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,20 @@ resource "google_container_cluster" "primary" {
278278
}
279279

280280
dynamic "node_pool_auto_config" {
281-
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
281+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
282282
content {
283-
network_tags {
284-
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
283+
dynamic "network_tags" {
284+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
285+
content {
286+
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
287+
}
288+
}
289+
290+
dynamic "linux_node_config" {
291+
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
292+
content {
293+
cgroup_mode = local.node_pools_cgroup_mode["all"]
294+
}
285295
}
286296
}
287297
}

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,20 @@ resource "google_container_cluster" "primary" {
278278
}
279279

280280
dynamic "node_pool_auto_config" {
281-
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
281+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
282282
content {
283-
network_tags {
284-
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
283+
dynamic "network_tags" {
284+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
285+
content {
286+
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
287+
}
288+
}
289+
290+
dynamic "linux_node_config" {
291+
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
292+
content {
293+
cgroup_mode = local.node_pools_cgroup_mode["all"]
294+
}
285295
}
286296
}
287297
}

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -278,10 +278,20 @@ resource "google_container_cluster" "primary" {
278278
}
279279

280280
dynamic "node_pool_auto_config" {
281-
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
281+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
282282
content {
283-
network_tags {
284-
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
283+
dynamic "network_tags" {
284+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
285+
content {
286+
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
287+
}
288+
}
289+
290+
dynamic "linux_node_config" {
291+
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
292+
content {
293+
cgroup_mode = local.node_pools_cgroup_mode["all"]
294+
}
285295
}
286296
}
287297
}

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

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,20 @@ resource "google_container_cluster" "primary" {
265265
}
266266

267267
dynamic "node_pool_auto_config" {
268-
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
268+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
269269
content {
270-
network_tags {
271-
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
270+
dynamic "network_tags" {
271+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
272+
content {
273+
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
274+
}
275+
}
276+
277+
dynamic "linux_node_config" {
278+
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
279+
content {
280+
cgroup_mode = local.node_pools_cgroup_mode["all"]
281+
}
272282
}
273283
}
274284
}

‎modules/private-cluster/cluster.tf‎

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,20 @@ resource "google_container_cluster" "primary" {
265265
}
266266

267267
dynamic "node_pool_auto_config" {
268-
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
268+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
269269
content {
270-
network_tags {
271-
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
270+
dynamic "network_tags" {
271+
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
272+
content {
273+
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
274+
}
275+
}
276+
277+
dynamic "linux_node_config" {
278+
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
279+
content {
280+
cgroup_mode = local.node_pools_cgroup_mode["all"]
281+
}
272282
}
273283
}
274284
}

‎test/integration/node_pool/testdata/TestNodePool.json‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@
203203
"config": {
204204
"diskSizeGb": 100,
205205
"diskType": "pd-balanced",
206-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
206+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
207207
"gcfsConfig": {},
208208
"imageType": "COS_CONTAINERD",
209209
"loggingConfig": {
@@ -267,7 +267,7 @@
267267
"config": {
268268
"diskSizeGb": 100,
269269
"diskType": "pd-standard",
270-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
270+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
271271
"imageType": "COS_CONTAINERD",
272272
"machineType": "e2-medium",
273273
"metadata": {
@@ -320,7 +320,7 @@
320320
"config": {
321321
"diskSizeGb": 100,
322322
"diskType": "pd-standard",
323-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
323+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
324324
"gcfsConfig": {},
325325
"imageType": "COS_CONTAINERD",
326326
"labels": {
@@ -423,7 +423,7 @@
423423
],
424424
"diskSizeGb": 30,
425425
"diskType": "pd-standard",
426-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
426+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
427427
"imageType": "COS_CONTAINERD",
428428
"labels": {
429429
"all-pools-example": "true",
@@ -505,7 +505,7 @@
505505
"config": {
506506
"diskSizeGb": 100,
507507
"diskType": "pd-standard",
508-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
508+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
509509
"imageType": "COS_CONTAINERD",
510510
"kubeletConfig": {
511511
"cpuCfsQuota": true,
@@ -605,7 +605,7 @@
605605
"config": {
606606
"diskSizeGb": 100,
607607
"diskType": "pd-standard",
608-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
608+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
609609
"imageType": "COS_CONTAINERD",
610610
"kubeletConfig": {
611611
"insecureKubeletReadonlyPortEnabled": false
@@ -704,7 +704,7 @@
704704
},
705705
"diskSizeGb": 100,
706706
"diskType": "pd-balanced",
707-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
707+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
708708
"imageType": "COS_CONTAINERD",
709709
"labels": {
710710
"all-pools-example": "true",

0 commit comments

Comments
 (0)