Skip to content
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

Vendor containerd 2.0 #1958

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

ambarve
Copy link
Contributor

@ambarve ambarve commented Nov 2, 2023

Containerd module has changed version to 2.0, This commit changes all of the contained package imports within hcsshim to use the new imports paths for containerd v2 module.

Containerd has also made some changes to the client APIs. There is now a new client package in containerd that hosts all of the client related code. Our tests have been updated to use this new package.

@ambarve ambarve requested a review from a team as a code owner November 2, 2023 21:49
Containerd module has changed version to 2.0, This commit changes all of the contained package imports within
hcsshim to use the new imports paths for containerd v2 module.

Containerd has also made some changes to the client APIs. There is now a new `client` package in containerd
that hosts all of the client related code. Our tests have been updated to use this new package.

Signed-off-by: Amit Barve <ambarve@microsoft.com>
@kevpar
Copy link
Member

kevpar commented Nov 3, 2023

A bit concerned about this change...

Shouldn't we wait till 2.0 is fully released before considering vendoring it in?

Are there issues with us updating to 2.x around compatibility with our downstream consumers if they still use 1.x themselves?

@kiashok
Copy link
Contributor

kiashok commented Nov 3, 2023

A bit concerned about this change...

Shouldn't we wait till 2.0 is fully released before considering vendoring it in?

Are there issues with us updating to 2.x around compatibility with our downstream consumers if they still use 1.x themselves?

Hi @kevpar , Derek mentioned yesterday that this change would be needed before 2.0 tag is cut (in about a month from now). Beta tag of containerd/2.0 is scheduled to go out before Kubecon on Monday.

Also, what do you mean by downstream consumers?

@apostasie
Copy link

apostasie commented Jul 10, 2024

Hey folks.

Hope this finds you well.
I am interested in getting this merged for nerdctl use (cc @AkihiroSuda)

I do have a working fork of hcsshim based off containerd v2 RC3 that we are using right now to test nerdctl w. ctdv2, and wanted to check with you if there is interest here in moving forward on that front.
Happy to submit a separate PR, or if @ambarve wants to carry this one over, happy to help as well.
If possible, we would love the PR applied against a release branch (existing one or new one), and not on main (methods signatures have changed on main, which would then require updating containerd in turn as well...)

Let me know your thoughts on this at your convenience.

Thanks!

@AkihiroSuda
Copy link

@apostasie Maybe you can try submitting a PR and see how it goes?

@kiashok
Copy link
Contributor

kiashok commented Jul 26, 2024

@apostasie Maybe you can try submitting a PR and see how it goes?

@AkihiroSuda @apostasie is there a reason you want to vendor containerd/2.0 into hcsshim right away?

cc @kevpar @ambarve @msscotb

@AkihiroSuda
Copy link

@AkihiroSuda @apostasie is there a reason you want to vendor containerd/2.0 into hcsshim right away?

Because nerdctl vendors hcsshim, and nerdctl v2 is going to vendor containerd v2:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants