[regression in master] containerd config v2 and v3 are mixed up

[AkihiroSuda]

The main containerd config is now version 3

Our config is still version 2:

lima/pkg/cidata/cidata.TEMPLATE.d/boot/40-install-containerd.sh

Lines 44 to 91 in 852c0bc

	if [ "${LIMA_CIDATA_CONTAINERD_SYSTEM}" = 1 ]; then
	if [ ! -e /etc/containerd/config.toml ]; then
	mkdir -p /etc/containerd
	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]
	[proxy_plugins."stargz"]
	type = "snapshot"
	address = "/run/containerd-stargz-grpc/containerd-stargz-grpc.sock"
	EOF
	fi
	if [ ! -e /etc/buildkit/buildkitd.toml ]; then
	mkdir -p /etc/buildkit
	cat >"/etc/buildkit/buildkitd.toml" <<EOF
	[worker.oci]
	enabled = false
	[worker.containerd]
	enabled = true
	namespace = "${CONTAINERD_NAMESPACE}"
	snapshotter = "${CONTAINERD_SNAPSHOTTER}"
	EOF
	fi
	systemctl enable --now containerd buildkit stargz-snapshotter
	fi
	if [ "${LIMA_CIDATA_CONTAINERD_USER}" = 1 ]; then
	if [ ! -e "${LIMA_CIDATA_HOME}/.config/containerd/config.toml" ]; then
	mkdir -p "${LIMA_CIDATA_HOME}/.config/containerd"
	cat >"${LIMA_CIDATA_HOME}/.config/containerd/config.toml" <<EOF
	version = 2
	[plugins."io.containerd.grpc.v1.cri"]
	enable_cdi = true
	[proxy_plugins]
	[proxy_plugins."fuse-overlayfs"]
	type = "snapshot"
	address = "/run/user/${LIMA_CIDATA_UID}/containerd-fuse-overlayfs.sock"
	[proxy_plugins."stargz"]
	type = "snapshot"
	address = "/run/user/${LIMA_CIDATA_UID}/containerd-stargz-grpc/containerd-stargz-grpc.sock"
	EOF
	chown -R "${LIMA_CIDATA_USER}" "${LIMA_CIDATA_HOME}/.config"
	fi

The configuration was not read, because it used the old config for config version 2 (it is now config version 3)

Doesn't seem true

Originally posted by @AkihiroSuda in #4185 (comment)

[afbjorklund]

I didn't check the code, only the configuration on the running instance... Will look again

[afbjorklund]

I was a bit confused, and got ahead of myself - the change doesn't happen until 2.2 or so?

Was confusing the contents of /etc/containerd/config.toml with the containerd config dump

  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]
    [proxy_plugins."stargz"]
      type = "snapshot"
      address = "/run/containerd-stargz-grpc/containerd-stargz-grpc.sock"

version = 3
root = '/var/lib/containerd'
state = '/run/containerd'
temp = ''
disabled_plugins = []
required_plugins = []
oom_score = 0
imports = []

...

The change #4185 is still good though, we should not need to look at the main config version.

And the indentation was still weird, but I think that happened somewhere in the yaml or bash?

• The main containerd config is soon version 3 #4185