-
Notifications
You must be signed in to change notification settings - Fork 211
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
feat: add containerd 2.0 to azureLinux 3.0 #5510
Conversation
58c24df
to
cd79b56
Compare
@@ -0,0 +1,35 @@ | |||
[Unit] | |||
Description=Kubelet |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
curious where this test data is coming from...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It is auto-generated by running make
, otherwise the Go Unit Tests cannot pass in the checks. I also see failed e2e tests on Ubuntu 2404: https://msazure.visualstudio.com/CloudNativeCompute/_build/results?buildId=111837790&view=ms.vss-test-web.build-test-results-tab&runId=1909463657&resultId=100056&paneView=debug, but it seems unrelated to my change, do you have idea on it?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
another PR was just merged which solves this, sorry for the confusion - feel free to rebase against dev to pick up the changes
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yeah i forgot to include those generated files from my last change. sorry about that
@@ -133,7 +133,10 @@ installStandaloneContainerd() { | |||
if [[ $OS_VERSION == "2.0" ]]; then | |||
containerdPackageName="moby-containerd-${desiredVersion}" | |||
fi | |||
|
|||
if [[ $OS_VERSION == "3.0" ]]; then | |||
containerdPackageName="containerd2-${desiredVersion}" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
curious about the package name though. should that be moby-containerd?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just to speak it out loud that we assume that azurelinux is only going to use containerd2 .. and not supporting 1.x versions even if the k8s version does not meet 1.32
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Azure Linux 3.0 will use the new containerd2 package which is already available in the preview repo in PMC now and will be published to prod repo soon. And yes, containerd 2.0 will be default for all Azure Linux 3.0 images regardless the k8s version.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm assuming we only give customers azlinuxv3 for the correct k8s versions anyways
cd79b56
to
38235c7
Compare
38235c7
to
9121a5b
Compare
9121a5b
to
7f031c8
Compare
7f031c8
to
842f0fd
Compare
842f0fd
to
ea97931
Compare
ea97931
to
6063c56
Compare
6063c56
to
76f729f
Compare
please add a new test case here:
|
@cameronmeissner The |
30a2e5e
to
367c53f
Compare
What type of PR is this?
What this PR does / why we need it:
As part of supporting containerd 2.0 in AKS 1.32, AzureLinux has built containerd 2 package and is releasing the new package, this PR is to make containerd 2.0 the default for all AzureLinux 3.0 nodes (regardless k8s version).
Which issue(s) this PR fixes:
Fixes #
Requirements:
Special notes for your reviewer:
Release note: