rework containerd config merging #1780
Merged
Conversation
This file contains 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
ndbaker1
force-pushed
the
containerd-config
branch
from
ed5bbe7
to
57c4c34
Compare
|
/ci |
|
@ndbaker1 the workflow that you requested has completed. 🎉
|
|
/ci |
|
@ndbaker1 the workflow that you requested has completed. 🎉
|
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.
Issue #, if available:
Description of changes:
It was recently realized that containerd's native import merging strategy is not one that behaves as most users would like. This is because it replaces the entire body under keyed maps such as
Plugins. This conflicts with the use case to override singular parameters under existing sections. (see xref).This PR implements the merging in an unstructured way so that users can continue providing whatever inline containerd config fields they would like overridden.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.
Testing Done
See this guide for recommended testing for PRs. Some tests may not apply. Completing tests and providing additional validation steps are not required, but it is recommended and may reduce review time and time to merge.