From 84b43336942d70abb6296c6d6b950efdd3ebcf82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anders=20F=20Bj=C3=B6rklund?= Date: Sun, 12 Oct 2025 09:54:51 +0200 Subject: [PATCH] The main containerd config is now version 3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also the indent of the config was too much Signed-off-by: Anders F Björklund --- templates/k8s.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/templates/k8s.yaml b/templates/k8s.yaml index b02bcca0560..ab89cd86b61 100644 --- a/templates/k8s.yaml +++ b/templates/k8s.yaml @@ -63,20 +63,20 @@ provision: #!/bin/bash set -eux -o pipefail [ -e /etc/containerd/conf.d/k8s.toml ] && exit 0 - grep "version = 2" /etc/containerd/config.toml || exit 1 mkdir -p /etc/containerd/conf.d # Configuring the systemd cgroup driver # Overriding the sandbox (pause) image - cat <>/etc/containerd/conf.d/k8s.toml - [plugins] - [plugins."io.containerd.grpc.v1.cri"] - sandbox_image = "$(kubeadm config images list | grep pause | sort -r | head -n1)" - [plugins."io.containerd.grpc.v1.cri".containerd] - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] - runtime_type = "io.containerd.runc.v2" - [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] - SystemdCgroup = true + cat </etc/containerd/conf.d/k8s.toml + version = 2 + [plugins] + [plugins."io.containerd.grpc.v1.cri"] + sandbox_image = "$(kubeadm config images list | grep pause | sort -r | head -n1)" + [plugins."io.containerd.grpc.v1.cri".containerd] + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes] + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc] + runtime_type = "io.containerd.runc.v2" + [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.runc.options] + SystemdCgroup = true EOF systemctl restart containerd # See