diff --git a/packages/containerd-2.1/snapshotter-toml b/packages/containerd-2.1/snapshotter-toml index 7a427fde1..a79ca55f6 100644 --- a/packages/containerd-2.1/snapshotter-toml +++ b/packages/containerd-2.1/snapshotter-toml @@ -6,13 +6,18 @@ std = { version = "v1" } {{#if (eq settings.container-runtime.snapshotter "soci" )}} [plugins."io.containerd.cri.v1.images"] snapshotter = "soci" -disable_snapshot_annotations = false + +[[plugins."io.containerd.transfer.v1.local".unpack_config]] +platform = "linux" +snapshotter = "soci" + # Plug soci snapshotter into containerd [proxy_plugins.soci] type = "snapshot" address = "/run/soci-snapshotter/soci-snapshotter.sock" [proxy_plugins.soci.exports] root = "/var/lib/soci-snapshotter" +enable_remote_snapshot_annotations = "true" {{else}} [plugins."io.containerd.cri.v1.images"] snapshotter = "overlayfs" diff --git a/packages/containerd-2.2/snapshotter-toml b/packages/containerd-2.2/snapshotter-toml index 7a427fde1..a79ca55f6 100644 --- a/packages/containerd-2.2/snapshotter-toml +++ b/packages/containerd-2.2/snapshotter-toml @@ -6,13 +6,18 @@ std = { version = "v1" } {{#if (eq settings.container-runtime.snapshotter "soci" )}} [plugins."io.containerd.cri.v1.images"] snapshotter = "soci" -disable_snapshot_annotations = false + +[[plugins."io.containerd.transfer.v1.local".unpack_config]] +platform = "linux" +snapshotter = "soci" + # Plug soci snapshotter into containerd [proxy_plugins.soci] type = "snapshot" address = "/run/soci-snapshotter/soci-snapshotter.sock" [proxy_plugins.soci.exports] root = "/var/lib/soci-snapshotter" +enable_remote_snapshot_annotations = "true" {{else}} [plugins."io.containerd.cri.v1.images"] snapshotter = "overlayfs" diff --git a/packages/kubernetes-1.33/prestart-load-pause-ctr.conf b/packages/kubernetes-1.33/prestart-load-pause-ctr.conf index 4e21b0d9b..0b36873c6 100644 --- a/packages/kubernetes-1.33/prestart-load-pause-ctr.conf +++ b/packages/kubernetes-1.33/prestart-load-pause-ctr.conf @@ -1,8 +1,13 @@ [Service] +Environment=ACTIVE_SNAPSHOTTER=overlayfs +EnvironmentFile=-/var/cache/containerd/active-snapshotter + # load the built-in pause image ExecStartPre=/usr/bin/ctr \ --namespace=k8s.io \ image import \ + --snapshotter=${ACTIVE_SNAPSHOTTER} \ + --local \ --all-platforms \ /usr/libexec/kubernetes/kubernetes-pause.tar diff --git a/packages/kubernetes-1.34/prestart-load-pause-ctr.conf b/packages/kubernetes-1.34/prestart-load-pause-ctr.conf index 4e21b0d9b..0b36873c6 100644 --- a/packages/kubernetes-1.34/prestart-load-pause-ctr.conf +++ b/packages/kubernetes-1.34/prestart-load-pause-ctr.conf @@ -1,8 +1,13 @@ [Service] +Environment=ACTIVE_SNAPSHOTTER=overlayfs +EnvironmentFile=-/var/cache/containerd/active-snapshotter + # load the built-in pause image ExecStartPre=/usr/bin/ctr \ --namespace=k8s.io \ image import \ + --snapshotter=${ACTIVE_SNAPSHOTTER} \ + --local \ --all-platforms \ /usr/libexec/kubernetes/kubernetes-pause.tar diff --git a/packages/kubernetes-1.35/prestart-load-pause-ctr.conf b/packages/kubernetes-1.35/prestart-load-pause-ctr.conf index 4e21b0d9b..0b36873c6 100644 --- a/packages/kubernetes-1.35/prestart-load-pause-ctr.conf +++ b/packages/kubernetes-1.35/prestart-load-pause-ctr.conf @@ -1,8 +1,13 @@ [Service] +Environment=ACTIVE_SNAPSHOTTER=overlayfs +EnvironmentFile=-/var/cache/containerd/active-snapshotter + # load the built-in pause image ExecStartPre=/usr/bin/ctr \ --namespace=k8s.io \ image import \ + --snapshotter=${ACTIVE_SNAPSHOTTER} \ + --local \ --all-platforms \ /usr/libexec/kubernetes/kubernetes-pause.tar diff --git a/packages/kubernetes-1.36/prestart-load-pause-ctr.conf b/packages/kubernetes-1.36/prestart-load-pause-ctr.conf index 4e21b0d9b..0b36873c6 100644 --- a/packages/kubernetes-1.36/prestart-load-pause-ctr.conf +++ b/packages/kubernetes-1.36/prestart-load-pause-ctr.conf @@ -1,8 +1,13 @@ [Service] +Environment=ACTIVE_SNAPSHOTTER=overlayfs +EnvironmentFile=-/var/cache/containerd/active-snapshotter + # load the built-in pause image ExecStartPre=/usr/bin/ctr \ --namespace=k8s.io \ image import \ + --snapshotter=${ACTIVE_SNAPSHOTTER} \ + --local \ --all-platforms \ /usr/libexec/kubernetes/kubernetes-pause.tar