github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-02-22 07:03:28 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #135740 from pohly/automated-cherry-pick-of-#135692-origin-release-1.34

Browse Source 
Automated cherry pick of #135692: local-up-cluster.sh: support more recent containerd like 2.2
This commit is contained in:
Kubernetes Prow Robot
2026-01-06 07:26:37 +05:30
committed by GitHub
parent 17044946fa 26cf4979fa
commit c84937eca9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
hack/local-up-cluster.sh
View File

@@ -1388,8 +1388,8 @@ if [[ "${KUBETEST_IN_DOCKER:-}" == "true" ]]; then
# configure and start containerd
echo "configuring containerd"
containerd config default > /etc/containerd/config.toml
sed -ie 's|root = "/var/lib/containerd"|root = "/docker-graph/containerd/daemon"|' /etc/containerd/config.toml
sed -ie 's|state = "/run/containerd"|state = "/var/run/docker/containerd/daemon"|' /etc/containerd/config.toml
sed -ie 's|root = ./var/lib/containerd.|root = "/docker-graph/containerd/daemon"|' /etc/containerd/config.toml
sed -ie 's|state = ./run/containerd.|state = "/var/run/docker/containerd/daemon"|' /etc/containerd/config.toml
sed -ie 's|enable_cdi = false|enable_cdi = true|' /etc/containerd/config.toml
echo "starting containerd"