-
Notifications
You must be signed in to change notification settings - Fork 614
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
go.mod update to containerd v2 #3173
Conversation
21c4664
to
753ce12
Compare
See initial comment up there ^. That was quite a trek, but CI is finally mostly green - and nothing depends on containerd v1. Anyhow, obviously this cannot be merged, since it depends on my forks - upstream PRs have to be merged first. Specifically, moving these two that have been there for a couple of weeks now would get us started:
Then we can look into the best approach for hcsshim and the rest. Cheers. |
Will rebase soon now that the stargz PR is in. |
76887e0
to
7b70603
Compare
Latest state of affairs:
|
7b70603
to
9128d84
Compare
1d0c392
to
441c04d
Compare
Status update: Work is going on for nydus: containerd/nydus-snapshotter#604 Nydus may be the last dep we need (as we may be able to ignore hcsshim for now). |
3a6f5f7
to
30b1c33
Compare
@AkihiroSuda we are getting closer. nydus was a lot more work than I thought and I had to send multiple PRs for a variety of issues that are pending. At this point, we need nydus to come through, and then the soci PR to get in (maybe we can convince them to have it on an ad-hoc branch meanwhile, as they want to wait post-v2-release). As far as nerdctl CI here is concerned, we get consistently green, with two exceptions:
Question for you: when ctd v2 is out, should we still care about that (u 20.04 + containerd 1.6)? I can go and debug this, but only want to spend time on this if we actually care about it :-) LMK your thoughts. Thanks. |
Thank you @apostasie for this hard work!
If it takes time, we can temporarily remove the support for nydus in nerdctl v2.0 and then put it back in v2.1+.
Yes, as they haven't reached EOL yet. |
aa91775
to
b297e8c
Compare
We are there:
This is ready for a first review. |
b297e8c
to
4944d67
Compare
949d798
to
d5c5602
Compare
Rebased. |
@AkihiroSuda PTAL at your convenience. |
|
||
"github.com/containerd/containerd/v2/core/remotes/docker" | ||
"github.com/containerd/containerd/v2/core/remotes/docker/config" | ||
"github.com/containerd/log" | ||
"github.com/containerd/nerdctl/v2/pkg/api/types" | ||
"github.com/containerd/nerdctl/v2/pkg/errutil" | ||
"github.com/containerd/nerdctl/v2/pkg/imgutil/dockerconfigresolver" |
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.
Personally I don't think we need to separate these dependencies. now dependencies from github.com
are split into 2 blocks. And in some places github.com/opencontainers
deps are colocated with github.com/containerd
deps.
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 can revert this. No strong opinion one way or the other, but I am interested in having one consistent style across (which we do not have now).
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.
lgtm, thanks
Thanks a lot for your time and review @djdongjin |
d5c5602
to
ba2a6ea
Compare
Signed-off-by: apostasie <[email protected]>
ba2a6ea
to
98cc368
Compare
@AkihiroSuda: comments addressed. |
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.
Thanks
Similar to #2902 - with the difference that it uses personal forks for pending PRs against important dependencies (updated against containerd v2).
Currently:
Upsteam dependencies to merge:
(blocked, depends on zdfs ^)Update dependencies (containerd v2) accelerated-container-image#290(blocked, depends on stargz)TBD nydusUpstream dependencies that do not have a proper PR (only our fork):
v2-backport
branch that does that.