Update to containerd v2.0 #11626
Merged
Update to containerd v2.0 #11626
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
containerd-2
branch
2 times, most recently
from
9d5fb84 to
e0f9107
Compare
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #11626 +/- ##
===========================================
+ Coverage 27.00% 46.80% +19.79%
===========================================
Files 206 206
Lines 19483 19519 +36
===========================================
+ Hits 5261 9135 +3874
+ Misses 13470 9057 -4413
- Partials 752 1327 +575
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. |
brandond
force-pushed
the
containerd-2
branch
from
e0f9107 to
f1f3f4f
Compare
brandond
force-pushed
the
containerd-2
branch
from
f1f3f4f to
1bbd7b0
Compare
brandond
force-pushed
the
containerd-2
branch
from
1bbd7b0 to
b28f6cb
Compare
dereknola
reviewed
Jan 30, 2025
dereknola
reviewed
Jan 30, 2025
dereknola
previously approved these changes
Jan 30, 2025
This was referenced Jan 30, 2025
Signed-off-by: Brad Davidson <[email protected]>
Ref: https://github.com/containerd/containerd/blob/release/2.0/docs/cri/config.md Since this is a breaking change, add support for a new v3 template file. If no v3 template is present, fall back to checking for the legacy v2 template and render the old structure. Signed-off-by: Brad Davidson <[email protected]>
brandond
force-pushed
the
containerd-2
branch
from
b28f6cb to
0802ef5
Compare
Don't block other linux steps on building the windows binary Signed-off-by: Brad Davidson <[email protected]>
brandond
force-pushed
the
containerd-2
branch
from
d09d615 to
0dfe5d2
Compare
vitorsavian
approved these changes
Feb 7, 2025
dereknola
approved these changes
Feb 7, 2025
This was referenced Feb 10, 2025
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
Types of Changes
Major version bump
Verification
Check version, and that everything works
Testing
Yes
Linked Issues
User-Facing Change
Further Comments
With this change, k3s will use the new config version by default. Since the versions cannot be mixed in a single file, user templates for the new version will be loaded from
config-v3.toml.tmpl. If this file does not exist, k3s will check forconfig.toml.tmpland if found, generate a config file with the legacy schema.Confusingly, containerd v1.7 uses config version 2, and containerd v2.0 uses config version 3.