Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1404,7 +1404,7 @@ presubmits:
- --focus-regex=\[NodeConformance\]|\[Feature:.+\]|\[Feature\]
- --skip-regex=\[Flaky\]|\[Slow\]|\[Serial\]|\[Feature:UserNamespacesSupport\]|\[Feature:UserNamespacesPodSecurityStandards\]|\[Feature:KubeletCredentialProviders\]|\[Feature:LockContention\]|\[Feature:SCTPConnectivity\]|\[Feature:PodLevelResources\]|\[Alpha\]
- '--test-args=--container-runtime-endpoint=unix:///run/containerd/containerd.sock --container-runtime-process-name=/usr/bin/containerd --container-runtime-pid-file= --kubelet-flags="--cgroup-driver=systemd --cgroups-per-qos=true --cgroup-root=/ --runtime-cgroups=/system.slice/containerd.service" --feature-gates=EventedPLEG=true --extra-log="{\"name\": \"containerd.log\", \"journalctl\": [\"-u\", \"containerd*\"]}"'
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/image-config-systemd.yaml
- --image-config-file=/home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/image-config-evented-pleg.yaml
resources:
limits:
cpu: 4
Expand Down
10 changes: 10 additions & 0 deletions jobs/e2e_node/containerd/image-config-evented-pleg.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# containerd 1.7 does not fully support the EventedPLEG feature. Testing the EventedPLEG feature on containerd 1.7 would cause the tests to fail.
# Therefore, we need to provide a testing environment for EventedPLEG based on containerd 2.x, which requires a separate image configuration file.
images:
ubuntu:
image_family: pipeline-1-34-amd64
project: ubuntu-os-gke-cloud
# the image regex is added so that only cgroupv2 images are selected.
# currently all images with cgroupv1 from gke have a -cgroupsv1 suffix
image_regex: ".*[^-cgroupsv1]$"
metadata: "user-data</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/init.yaml,cni-template</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/cni.template,containerd-config</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/config.toml,registry-config-docker</home/prow/go/src/k8s.io/test-infra/jobs/e2e_node/containerd/hosts-docker.toml"