Consolidate linux and windows containerd config templates #11707
+172
−283
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
brandond
force-pushed
the
consolidate-containerd-template
branch
from
e567e4a to
804b334
Compare
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
brandond
force-pushed
the
consolidate-containerd-template
branch
from
804b334 to
a468283
Compare
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.
Proposed Changes
Consolidate linux and windows containerd config templates.
There was no reason for these to ever be separated. 90% of the config in the Windows template was just copy-pasted default values. The few things that DO need to be different on Windows can be handled by existing template vars.
The windows template also had the wrong structure for registry auth, which broke authenticated pulls on windows.
Types of Changes
Verification
Testing
Linked Issues
User-Facing Change
Further Comments