From df34a6d853ee65cfbc0cf93d6ecffc91d2f8df45 Mon Sep 17 00:00:00 2001
From: Lars Yencken <lars@yencken.org>
Date: Mon, 27 Apr 2026 16:12:40 +0200
Subject: [PATCH] Emit transfer.v1.local unpack_config for
 containerd_snapshotter

containerd 2.2.2 requires an explicit unpack_config entry per snapshotter;
without one, image pulls on ZFS workers fail with "no unpack platforms
defined". Also add an imports = ["/etc/containerd/conf.d/*.toml"] line so
post-bringup drop-ins (e.g. nvidia toolkit's 99-nvidia.toml) are picked
up without a second manual edit.

FOUND-795
---
 .../container-engine/containerd/templates/config.toml.j2  | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/roles/container-engine/containerd/templates/config.toml.j2 b/roles/container-engine/containerd/templates/config.toml.j2
index 37534ff64dd..71c8c24fd71 100644
--- a/roles/container-engine/containerd/templates/config.toml.j2
+++ b/roles/container-engine/containerd/templates/config.toml.j2
@@ -1,5 +1,7 @@
 version = 3
 
+imports = ["/etc/containerd/conf.d/*.toml"]
+
 root = "{{ containerd_storage_dir }}"
 state = "{{ containerd_state_dir }}"
 oom_score = {{ containerd_oom_score }}
@@ -88,6 +90,12 @@ oom_score = {{ containerd_oom_score }}
   [plugins."io.containerd.nri.v1.nri"]
     disable = {{ 'false' if nri_enabled else 'true' }}
 
+  [plugins."io.containerd.transfer.v1.local"]
+    [[plugins."io.containerd.transfer.v1.local".unpack_config]]
+      differ = ""
+      platform = "linux/amd64"
+      snapshotter = "{{ containerd_snapshotter }}"
+
 {% if containerd_tracing_enabled %}
   [plugins."io.containerd.tracing.processor.v1.otlp"]
     endpoint = "{{ containerd_tracing_endpoint }}"