From a2b71f994e0be2b7168700c47ab2465a1088334a Mon Sep 17 00:00:00 2001 From: Satwik Sai Prakash Sahoo Date: Sun, 13 Sep 2026 08:45:14 +0530 Subject: [PATCH] sysext/containerd: read drop-ins from /etc/containerd/conf.d Custom containerd settings currently require a copy of the shipped configuration, which misses later changes to its defaults. Import /etc/containerd/conf.d/*.toml from both shipped configurations so local settings can use containerd's native configuration merging. Signed-off-by: Satwik Sai Prakash Sahoo --- changelog/changes/2026-09-13-containerd-dropin-config.md | 1 + .../containerd/usr/share/containerd/config-cgroupfs.toml | 3 +++ .../coreos/sysext/containerd/usr/share/containerd/config.toml | 3 +++ 3 files changed, 7 insertions(+) create mode 100644 changelog/changes/2026-09-13-containerd-dropin-config.md diff --git a/changelog/changes/2026-09-13-containerd-dropin-config.md b/changelog/changes/2026-09-13-containerd-dropin-config.md new file mode 100644 index 00000000000..144823e1cfe --- /dev/null +++ b/changelog/changes/2026-09-13-containerd-dropin-config.md @@ -0,0 +1 @@ +- Added containerd configuration imports from `/etc/containerd/conf.d/*.toml` to allow local settings without copying the shipped config ([scripts#4150](https://github.com/flatcar/scripts/pull/4150)) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml index 742fbf4355c..5369c2e7b92 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml +++ b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config-cgroupfs.toml @@ -1,5 +1,8 @@ version = 2 +# allow local settings without copying the shipped config +imports = ["/etc/containerd/conf.d/*.toml"] + # persistent data location root = "/var/lib/containerd" # runtime state information diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml index babc77b0e06..ee3ecfda58d 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml +++ b/sdk_container/src/third_party/coreos-overlay/coreos/sysext/containerd/usr/share/containerd/config.toml @@ -1,5 +1,8 @@ version = 2 +# allow local settings without copying the shipped config +imports = ["/etc/containerd/conf.d/*.toml"] + # persistent data location root = "/var/lib/containerd" # runtime state information