✨ Backwards compatible support for containerd 2 #1521
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
syself-bot
bot
added
size/M
|
This comment will be tracked and updated by renovatebot. This is for demonstration purposes only, to show how to use automation while keeping components up to date. We haven't matched all the parts to this, so we can either keep it or drop it. Best case scenario, someone will align it with all the templates to make it easier to keep the components up to date. |
syself-bot
bot
added
size/L
guettli
reviewed
Jan 6, 2025
guettli
reviewed
Jan 6, 2025
emolitor
commented
Jan 6, 2025
|
@emolitor just out of curiosity: Why do you want to use containerd 2.x? Which features do you need, and why? |
Closed
Was playing around with the Transfer Service as a spike to prototype something and it is only stable in v2. |
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.
What this PR does / why we need it: Backwards compatible support for containerd 2
Fixes: #1522
Special notes for your reviewer: I used a variation of this over the holidays while testing CAPH. The support for the 'batteries included' containerd release was deprecated a while ago and removed in containerd 2.0. This change updates the Ubuntu quickstart templates and packer templates to use the supported packaging for containerd and separately installs runc. This was tested with containerd 1.7.24 and containerd 2.0.1.
One subtle change to make note of is moving the hardening of /etc/cni permissions into kubernetes.sh for the packer templates. Previously the containerd 'batteries included' package included kubernetes-cni as well as being installed as a dependency of kubelet (from the Kubernetes apt repo). Now that kubernetes-cni is solely being installed as part of the kubernetes apt packaging I've moved the permissions change out of cri.sh and into kubernetes.sh.
Lastly I simplified setting ARCH to use dpkg instead of uname as, at least for Ubuntu and Debian, it's a much cleaner approach.
Feedback is greatly appreciated. One question I had is what is the purpose of the structed comment on the existing CONTAINERD version line (see following). It seems like the RUNC version might want something similar?
export CONTAINERD=1.7.24 # update: datasource=github-tags depName=containerd/containerd extractVersion=^v(?<version>.*)$ versioning=semver