Add conf.d include in the default config#12323
Merged
mxpv merged 1 commit intocontainerd:mainfrom Sep 25, 2025
Merged
Conversation
Signed-off-by: Maksym Pavlenko <[email protected]>
dcantah
approved these changes
Sep 24, 2025
dmcgowan
approved these changes
Sep 25, 2025
github-project-automation
bot
moved this from Needs Triage
to Review In Progress
in Pull Request Review
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
akhilerm
approved these changes
Sep 25, 2025
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
github-project-automation
bot
moved this from Review In Progress
to Done
in Pull Request Review
This was referenced Sep 25, 2025
1 task
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
5 participants
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.
We've reworked config merging strategy in 2.0 - #9982
This change adds
/etc/containerd/conf.d/*.tomlto the default configuration to allow configs drop-ins without the need to change root configuration file.❯ bin/containerd config default ... imports = ['/etc/containerd/conf.d/*.toml']