Skip to content

Commit c224f89

Browse files
fix: Update testcases to default NAP EFFECTIVE_CGROUP_MODE_V2
1 parent 0e45bad commit c224f89

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

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 = {

test/integration/node_pool/testdata/TestNodePool.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@
156156
"nodeConfig": {
157157
"diskSizeGb": 100,
158158
"diskType": "pd-balanced",
159-
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V2",
159+
"effectiveCgroupMode": "EFFECTIVE_CGROUP_MODE_V1",
160160
"gcfsConfig": {},
161161
"imageType": "COS_CONTAINERD",
162162
"loggingConfig": {
@@ -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)