sysext/containerd: read drop-ins from /etc/containerd/conf.d - #4150
Open
satwiksps wants to merge 1 commit into
Open
sysext/containerd: read drop-ins from /etc/containerd/conf.d#4150satwiksps wants to merge 1 commit into
satwiksps wants to merge 1 commit into
Conversation
satwiksps
force-pushed
the
containerd-dropin-config
branch
from
August 6, 2026 01:27
1e044ba to
a5b3566
Compare
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 <sahoospsatwik@gmail.com>
satwiksps
force-pushed
the
containerd-dropin-config
branch
from
September 13, 2026 13:42
a5b3566 to
a2b71f9
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changing containerd settings currently means copying the default config. That copy can miss updates to the defaults later.
This change makes both shipped configs read
/etc/containerd/conf.d/*.toml, so users can keep their own settings in separate files.Fixes flatcar/Flatcar#1127.
How to use
Create
/etc/containerd/conf.d/50-log.tomlwith these contents, then restart containerd:Use
version = 2to match the shipped configs. Files are read in filename order. Lists are combined, and some empty or zero values do not replace existing settings. A missing or empty directory leaves the settings unchanged. If you use your own main config, add the imports line there too.Testing done
git diff --checkpassed.Test logs and scripts. The tests used the same config files as this PR. The VM used a published Flatcar image, cgroup v2, SELinux permissive mode and host networking. SELinux enforcing mode, CNI, Kubernetes and a custom OS build were not tested. The test scripts are on a separate branch.
AI helped with the investigation, code change and tests.