Skip to content

Commit bcebc0f

Browse files
committed
Make pull-kubernetes-node-swap-ubuntu-serial run with cgroup v2
Signed-off-by: Itamar Holder <[email protected]>
1 parent 37c1cec commit bcebc0f

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -1319,6 +1319,8 @@ presubmits:
13191319
- --deployment=node
13201320
- --gcp-zone=us-west1-b
13211321
- --node-args=--image-config-file=/workspace/test-infra/jobs/e2e_node/swap/image-config-swap.yaml
1322+
- --env=KUBE_MASTER_EXTRA_METADATA=user-data=/go/src/github.com/containerd/containerd/test/e2e/master.yaml,containerd-configure-sh=/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh=/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env=/workspace/test-infra/jobs/e2e_node/containerd/containerd-main/cgroupv2/env-cgroupv2
1323+
- --env=KUBE_NODE_EXTRA_METADATA=user-data=/go/src/github.com/containerd/containerd/test/e2e/node.yaml,containerd-configure-sh=/go/src/github.com/containerd/containerd/cluster/gce/configure.sh,containerd-extra-init-sh=/go/src/github.com/containerd/containerd/test/e2e_node/gci-init.sh,containerd-env=/workspace/test-infra/jobs/e2e_node/containerd/containerd-main/cgroupv2/env-cgroupv2
13221324
- '--node-test-args=--feature-gates=NodeSwap=true --container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroups-per-qos=true --cgroup-root=/ --fail-swap-on=false --runtime-cgroups=/system.slice/containerd.service" --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
13231325
- --node-tests=true
13241326
- --provider=gce

0 commit comments

Comments
 (0)