Skip to content

fix: Add the nodepool cgroup mode to the NAP config #2356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

fix: Add the nodepool cgroup mode to the NAP config #2356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1cd25ed
fix: Add the nodepool cgroup mode to the NAP config
davidholsgrove May 22, 2025
9dc7be6
chore: Update testcases to default NAP EFFECTIVE_CGROUP_MODE_V2
davidholsgrove Jun 3, 2025
002e01c
chore: Update testcase to remove node pool-01 CGROUP_MODE_V1 setting
davidholsgrove Jun 9, 2025
4abd4be
fix: Gate network_tags
davidholsgrove Jun 18, 2025
09d7ecb
chore: Set test node pool-01 to CGROUP_MODE_V1
davidholsgrove Jun 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions autogen/main/cluster.tf.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,10 +322,20 @@ resource "google_container_cluster" "primary" {

{% if autopilot_cluster != true %}
dynamic "node_pool_auto_config" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
content {
network_tags {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
dynamic "network_tags" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
content {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
}
}

dynamic "linux_node_config" {
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
content {
cgroup_mode = local.node_pools_cgroup_mode["all"]
}
}
}
}
Expand Down
16 changes: 13 additions & 3 deletions cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,20 @@ resource "google_container_cluster" "primary" {
}

dynamic "node_pool_auto_config" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
content {
network_tags {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
dynamic "network_tags" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
content {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
}
}

dynamic "linux_node_config" {
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
content {
cgroup_mode = local.node_pools_cgroup_mode["all"]
}
}
}
}
Expand Down
4 changes: 2 additions & 2 deletions examples/node_pool/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ module "gke" {
}

node_pools_cgroup_mode = {
all = "CGROUP_MODE_V1"
pool-01 = "CGROUP_MODE_V2"
all = "CGROUP_MODE_V2"
pool-01 = "CGROUP_MODE_V1"
}

node_pools_hugepage_size_2m = {
Expand Down
16 changes: 13 additions & 3 deletions modules/beta-private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,20 @@ resource "google_container_cluster" "primary" {
}

dynamic "node_pool_auto_config" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
content {
network_tags {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
dynamic "network_tags" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
content {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
}
}

dynamic "linux_node_config" {
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
content {
cgroup_mode = local.node_pools_cgroup_mode["all"]
}
}
}
}
Expand Down
16 changes: 13 additions & 3 deletions modules/beta-private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,20 @@ resource "google_container_cluster" "primary" {
}

dynamic "node_pool_auto_config" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
content {
network_tags {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
dynamic "network_tags" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
content {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
}
}

dynamic "linux_node_config" {
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
content {
cgroup_mode = local.node_pools_cgroup_mode["all"]
}
}
}
}
Expand Down
16 changes: 13 additions & 3 deletions modules/beta-public-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,20 @@ resource "google_container_cluster" "primary" {
}

dynamic "node_pool_auto_config" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
content {
network_tags {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
dynamic "network_tags" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
content {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
}
}

dynamic "linux_node_config" {
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
content {
cgroup_mode = local.node_pools_cgroup_mode["all"]
}
}
}
}
Expand Down
16 changes: 13 additions & 3 deletions modules/beta-public-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,10 +244,20 @@ resource "google_container_cluster" "primary" {
}

dynamic "node_pool_auto_config" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
content {
network_tags {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
dynamic "network_tags" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
content {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
}
}

dynamic "linux_node_config" {
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
content {
cgroup_mode = local.node_pools_cgroup_mode["all"]
}
}
}
}
Expand Down
16 changes: 13 additions & 3 deletions modules/private-cluster-update-variant/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,20 @@ resource "google_container_cluster" "primary" {
}

dynamic "node_pool_auto_config" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
content {
network_tags {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
dynamic "network_tags" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
content {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
}
}

dynamic "linux_node_config" {
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
content {
cgroup_mode = local.node_pools_cgroup_mode["all"]
}
}
}
}
Expand Down
16 changes: 13 additions & 3 deletions modules/private-cluster/cluster.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,20 @@ resource "google_container_cluster" "primary" {
}

dynamic "node_pool_auto_config" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules || local.node_pools_cgroup_mode != null) ? [1] : []
content {
network_tags {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
dynamic "network_tags" {
for_each = var.cluster_autoscaling.enabled && (length(var.network_tags) > 0 || var.add_cluster_firewall_rules) ? [1] : []
content {
tags = var.add_cluster_firewall_rules ? (concat(var.network_tags, [local.cluster_network_tag])) : var.network_tags
}
}

dynamic "linux_node_config" {
for_each = local.node_pools_cgroup_mode["all"] != "" ? [1] : []
content {
cgroup_mode = local.node_pools_cgroup_mode["all"]
}
}
}
}
Expand Down
16 changes: 8 additions & 8 deletions test/integration/node_pool/testdata/TestNodePool.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@
"nodeConfig": {
"diskSizeGb": 100,
"diskType": "pd-balanced",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
"gcfsConfig": {},
"imageType": "COS_CONTAINERD",
"loggingConfig": {
Expand Down Expand Up @@ -203,7 +203,7 @@
"config": {
"diskSizeGb": 100,
"diskType": "pd-balanced",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
"gcfsConfig": {},
"imageType": "COS_CONTAINERD",
"loggingConfig": {
Expand Down Expand Up @@ -267,7 +267,7 @@
"config": {
"diskSizeGb": 100,
"diskType": "pd-standard",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
"imageType": "COS_CONTAINERD",
"machineType": "e2-medium",
"metadata": {
Expand Down Expand Up @@ -320,7 +320,7 @@
"config": {
"diskSizeGb": 100,
"diskType": "pd-standard",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
"gcfsConfig": {},
"imageType": "COS_CONTAINERD",
"labels": {
Expand Down Expand Up @@ -423,7 +423,7 @@
],
"diskSizeGb": 30,
"diskType": "pd-standard",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
"imageType": "COS_CONTAINERD",
"labels": {
"all-pools-example": "true",
Expand Down Expand Up @@ -505,7 +505,7 @@
"config": {
"diskSizeGb": 100,
"diskType": "pd-standard",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
"imageType": "COS_CONTAINERD",
"kubeletConfig": {
"cpuCfsQuota": true,
Expand Down Expand Up @@ -605,7 +605,7 @@
"config": {
"diskSizeGb": 100,
"diskType": "pd-standard",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
"imageType": "COS_CONTAINERD",
"kubeletConfig": {
"insecureKubeletReadonlyPortEnabled": false
Expand Down Expand Up @@ -704,7 +704,7 @@
},
"diskSizeGb": 100,
"diskType": "pd-balanced",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
"imageType": "COS_CONTAINERD",
"labels": {
"all-pools-example": "true",
Expand Down