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
3 changes: 3 additions & 0 deletions pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ]; then
mkdir -p /etc/containerd /etc/buildkit
cat >"/etc/containerd/config.toml" <<EOF
version = 2
# TODO: remove imports after upgrading containerd to v2.2, as
# conf.d is set by default since v2.2.
imports = ['/etc/containerd/conf.d/*.toml']
[plugins."io.containerd.grpc.v1.cri"]
enable_cdi = true
[proxy_plugins]
Expand Down
7 changes: 4 additions & 3 deletions templates/k8s.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# NAME STATUS ROLES AGE VERSION
# lima-k8s Ready control-plane,master 44s v1.22.3

minimumLimaVersion: 1.1.0
minimumLimaVersion: 2.0.0

base: template://_images/ubuntu-lts

Expand Down Expand Up @@ -62,11 +62,12 @@ provision:
script: |
#!/bin/bash
set -eux -o pipefail
grep SystemdCgroup /etc/containerd/config.toml && exit 0
[ -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 <<EOF >>/etc/containerd/config.toml
cat <<EOF >>/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)"
Expand Down