github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #11503 from k8s-infra-cherrypick-robot/cherry-pick-11489-to-release/2.0

Browse Source 
[release/2.0] e2e: use the shim bundled with containerd artifact
This commit is contained in:
Phil Estes 2025-03-07 16:05:43 -05:00 committed by GitHub
commit 62f18de18b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/gce/configure.sh
View File

@ -230,6 +230,7 @@ disabled_plugins = ["io.containerd.internal.v1.restart"]
default_runtime_name = "${CONTAINERD_DEFAULT_RUNTIME:-"runc"}" default_runtime_name = "${CONTAINERD_DEFAULT_RUNTIME:-"runc"}"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc]
runtime_type = "io.containerd.runc.v2" runtime_type = "io.containerd.runc.v2"
runtime_path = "${CONTAINERD_HOME}/usr/local/bin/containerd-shim-runc-v2"
[plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options]
BinaryName = "${CONTAINERD_HOME}/usr/local/sbin/runc" BinaryName = "${CONTAINERD_HOME}/usr/local/sbin/runc"
SystemdCgroup = ${systemdCgroup} SystemdCgroup = ${systemdCgroup}