From 1e044ba608a5b211d3b7ab2325a5a703fa61ee6b Mon Sep 17 00:00:00 2001 From: Satwik Sai Prakash Sahoo Date: Fri, 24 Jul 2026 23:37:09 +0530 Subject: [PATCH] sysext/containerd: define drop-in config directory This enables containerd to load drop-in configuration snippets from /etc/containerd/conf.d/ on startup, allowing users to customize containerd settings without copying or overriding the read-only base configuration file. Signed-off-by: Satwik Sai Prakash Sahoo --- changelog/changes/2026-07-24-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-07-24-containerd-dropin-config.md diff --git a/changelog/changes/2026-07-24-containerd-dropin-config.md b/changelog/changes/2026-07-24-containerd-dropin-config.md new file mode 100644 index 00000000000..a4d13e4286f --- /dev/null +++ b/changelog/changes/2026-07-24-containerd-dropin-config.md @@ -0,0 +1 @@ +- Added drop-in configuration directory support (/etc/containerd/conf.d/*.toml) to default containerd configuration ([Flatcar#1127](https://github.com/flatcar/Flatcar/issues/1127)) 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..80a3fdaf028 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 drop-in configuration files to override and extend settings +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..926aab950df 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 drop-in configuration files to override and extend settings +imports = ["/etc/containerd/conf.d/*.toml"] + # persistent data location root = "/var/lib/containerd" # runtime state information