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..7569c6f68cf --- /dev/null +++ b/changelog/changes/2026-07-24-containerd-dropin-config.md @@ -0,0 +1 @@ +- Added support for containerd drop-in configuration in `/etc/containerd/conf.d/*.toml`, so settings can be adjusted without replacing 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..04ce6478165 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 +# drop-in configuration, takes precedence over the settings below +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..ebd970a3bab 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 +# drop-in configuration, takes precedence over the settings below +imports = ["/etc/containerd/conf.d/*.toml"] + # persistent data location root = "/var/lib/containerd" # runtime state information