From 0f6637565cef9bd439b80f8d06da6f09a03454ce Mon Sep 17 00:00:00 2001 From: HirazawaUi <695097494plus@gmail.com> Date: Wed, 5 Nov 2025 21:20:54 +0800 Subject: [PATCH] add image config file for evented pleg --- .../jobs/kubernetes/sig-node/sig-node-presubmit.yaml | 2 +- .../e2e_node/containerd/image-config-evented-pleg.yaml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) create mode 100644 jobs/e2e_node/containerd/image-config-evented-pleg.yaml diff --git a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml index a57a4276e964..8b388a89545b 100644 --- a/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml +++ b/config/jobs/kubernetes/sig-node/sig-node-presubmit.yaml @@ -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 diff --git a/jobs/e2e_node/containerd/image-config-evented-pleg.yaml b/jobs/e2e_node/containerd/image-config-evented-pleg.yaml new file mode 100644 index 000000000000..fa466b9ac778 --- /dev/null +++ b/jobs/e2e_node/containerd/image-config-evented-pleg.yaml @@ -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