go.mod update to containerd v2 #3173

apostasie · 2024-07-04T08:55:23Z

Similar to #2902 - with the difference that it uses personal forks for pending PRs against important dependencies (updated against containerd v2).

Currently:

fully updated to containerd v2 without any indirect to v1.7
does build and run
all dependencies have been updated to containerd v2
unit test pass
rootless tests pass
rootful tests pass - some timeout failures currently
windows is working

Upsteam dependencies to merge:

Update dependencies (containerd v2) data-accelerator/zdfs#3
~~(blocked, depends on zdfs ^)~~ Update dependencies (containerd v2) accelerated-container-image#290
Containerd v2.0.0-rc.3 stargz-snapshotter#1722
~~(blocked, depends on stargz)~~ TBD nydus
https://github.com/awslabs/soci-snapshotter/pull/1305/files

Upstream dependencies that do not have a proper PR (only our fork):

Moby sysinfo package - folder has been copied under here for now - there is a couple of PRs hanging around but they look very stale (Derek' six months+ Update containerd to 2.0 moby/moby#47255 )
hcsshim: has to be patched against their latest released version, and not main - main is breaking API, which would mean updating containerd against that (and it is probably unstable / untested anyhow). Our fork has a v2-backport branch that does that.
nydus: current fork is bare minimum and there is definitely some more work needed on their CI tooling needed - it is based off main, which might not be the right choice - finally, nydus depends on stargz and hcsshim, which means these two have to get in first

apostasie · 2024-07-04T23:40:22Z

@AkihiroSuda

See initial comment up there ^.

That was quite a trek, but CI is finally mostly green - and nothing depends on containerd v1.
I am a bit concerned over the failing ones though, timeouts feel like maybe something is deadlocked somewhere.

Anyhow, obviously this cannot be merged, since it depends on my forks - upstream PRs have to be merged first.
I opened a bunch of them already, and have more to come from my forks.
I can use some help there to move them along - I am not sure why they are blocked - I guess people are busy.

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.

apostasie · 2024-07-09T17:21:08Z

Will rebase soon now that the stargz PR is in.

apostasie · 2024-07-10T22:59:21Z

Latest state of affairs:

see top level comment for dependencies status updated list
CI is green EXCEPT test-integration-20.04-v1.6.33 which seems to hang on something and timeout - do we care? is 1.6 going to be deprecated with the release of v2?
next important focus will be hcsshim - see discussion at: Vendor containerd 2.0 microsoft/hcsshim#1958 (comment)

apostasie · 2024-07-25T21:20:38Z

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).

apostasie · 2024-07-25T22:38:55Z

@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:

TestVolumeLsFilter is failing a lot on Windows #3228 which is racy, and possibly unrelated to containerdv2, and also TestTailFollowRotateLogs is still failing #3225 are still failing a lot
ubuntu 20.04 + containerd 1.6 seems to always hit the timeout - either it is slower than before, or it is deadlocking for whatever reason

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.

AkihiroSuda · 2024-07-26T17:48:19Z

Thank you @apostasie for this hard work!

nydus was a lot more work than I thought and I had to send multiple PRs for a variety of issues that are pending.

If it takes time, we can temporarily remove the support for nydus in nerdctl v2.0 and then put it back in v2.1+.
I think this is acceptable, as we are bumping up the major version.
Same applies to SOCI too.

Question for you: when ctd v2 is out, should we still care about that (u 20.04 + containerd 1.6)?

Yes, as they haven't reached EOL yet.

apostasie · 2024-08-06T18:37:32Z

@AkihiroSuda

We are there:

nydus and soci have been resolved - all dependencies we needed have been migrated and we are now using them instead of my forks
the ONE exception to above is moby/pkg/sysinfo - I did fork it out into ./pkg/sysinfo - I do not see another good solution (some discussion with Sebastiaan over here: Update to containerd v2 nydus-snapshotter#604 (comment)) - also see note in go.mod and in pkg/sysinfo/README.md - let me know if this OK
CI is green

EXCEPT Ubuntu 20.04 + containerd 1.6 it just hangs-up on inside TestStats and sits there forever - This definitely has to do with nerdctl stats and cgroups version, and I am out of my depth here. I'll keep investigating, but any pointer would be welcome - cc @fahedouch maybe you have an idea? (maybe related to #223) <- nvm, I figured it out. Sorry for the noise

This is ready for a first review.

Dockerfile

apostasie · 2024-08-07T00:30:54Z

Rebased.

apostasie · 2024-08-07T21:32:47Z

@AkihiroSuda PTAL at your convenience.
No rush of course.
I'll keep rebasing this when it drifts.

pkg/cioutil/container_io.go

pkg/cmd/container/run_restart.go

djdongjin · 2024-08-07T23:36:23Z

pkg/cmd/login/login.go

+
+	"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"


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.

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).

go.mod

djdongjin

lgtm, thanks

apostasie · 2024-08-08T02:23:01Z

lgtm, thanks

Thanks a lot for your time and review @djdongjin
Appreciated.

pkg/sysinfo/cgroup2_linux.go

pkg/sysinfo/README.md

Signed-off-by: apostasie <spam_blackhole@farcloser.world>

apostasie · 2024-08-09T02:32:00Z

@AkihiroSuda: comments addressed.

pkg/sysinfo/doc.go

AkihiroSuda

Thanks

apostasie mentioned this pull request Jul 4, 2024

v2.0 planning #2734

Closed

apostasie force-pushed the go-mod-containerd-v2 branch 5 times, most recently from 21c4664 to 753ce12 Compare July 4, 2024 22:55

apostasie changed the title ~~go.mod update to containerd v2~~ [CANARY] go.mod update to containerd v2 Jul 5, 2024

apostasie force-pushed the go-mod-containerd-v2 branch 6 times, most recently from 76887e0 to 7b70603 Compare July 10, 2024 21:17

apostasie force-pushed the go-mod-containerd-v2 branch from 7b70603 to 9128d84 Compare July 12, 2024 18:45

apostasie force-pushed the go-mod-containerd-v2 branch 2 times, most recently from 1d0c392 to 441c04d Compare July 20, 2024 18:46

This was referenced Jul 22, 2024

Update to containerd v2 containerd/nydus-snapshotter#604

Merged

go.mod: github.com/containerd/containerd v1.7.18, switch to github.com/containerd/errdefs module containerd/nydus-snapshotter#599

Merged

apostasie force-pushed the go-mod-containerd-v2 branch 4 times, most recently from 3a6f5f7 to 30b1c33 Compare July 25, 2024 22:06

This was referenced Jul 26, 2024

Vendor containerd 2.0 microsoft/hcsshim#1958

Open

[WIP] go.mod: github.com/containerd/containerd/v2 v2.0.0-rc.0 #2902

Closed

apostasie force-pushed the go-mod-containerd-v2 branch 5 times, most recently from aa91775 to b297e8c Compare August 6, 2024 18:11

apostasie marked this pull request as ready for review August 6, 2024 18:37

apostasie changed the title ~~[CANARY] go.mod update to containerd v2~~ go.mod update to containerd v2 Aug 6, 2024

apostasie force-pushed the go-mod-containerd-v2 branch from b297e8c to 4944d67 Compare August 6, 2024 18:40

apostasie commented Aug 6, 2024

View reviewed changes

Dockerfile Show resolved Hide resolved

apostasie force-pushed the go-mod-containerd-v2 branch 3 times, most recently from 949d798 to d5c5602 Compare August 7, 2024 00:30

AkihiroSuda requested a review from a team August 7, 2024 22:00

djdongjin reviewed Aug 8, 2024

View reviewed changes

djdongjin approved these changes Aug 8, 2024

View reviewed changes

AkihiroSuda reviewed Aug 8, 2024

View reviewed changes

pkg/sysinfo/cgroup2_linux.go Show resolved Hide resolved

AkihiroSuda reviewed Aug 8, 2024

View reviewed changes

pkg/sysinfo/README.md Outdated Show resolved Hide resolved

apostasie force-pushed the go-mod-containerd-v2 branch from d5c5602 to ba2a6ea Compare August 9, 2024 01:21

Containerd v2

98cc368

Signed-off-by: apostasie <spam_blackhole@farcloser.world>

apostasie force-pushed the go-mod-containerd-v2 branch from ba2a6ea to 98cc368 Compare August 9, 2024 01:27

AkihiroSuda added this to the v2.0.0 milestone Aug 9, 2024

AkihiroSuda reviewed Aug 9, 2024

View reviewed changes

pkg/sysinfo/doc.go Show resolved Hide resolved

AkihiroSuda approved these changes Aug 9, 2024

View reviewed changes

AkihiroSuda merged commit 7aa8ca9 into containerd:main Aug 9, 2024
19 checks passed

apostasie mentioned this pull request Aug 9, 2024

Post containerd v2 cleanup #3288

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

go.mod update to containerd v2 #3173

go.mod update to containerd v2 #3173

apostasie commented Jul 4, 2024 •

edited

Loading

apostasie commented Jul 4, 2024

apostasie commented Jul 9, 2024

apostasie commented Jul 10, 2024 •

edited

Loading

apostasie commented Jul 25, 2024

apostasie commented Jul 25, 2024 •

edited

Loading

AkihiroSuda commented Jul 26, 2024

apostasie commented Aug 6, 2024 •

edited

Loading

apostasie commented Aug 7, 2024

apostasie commented Aug 7, 2024

djdongjin Aug 7, 2024

apostasie Aug 8, 2024

djdongjin left a comment

apostasie commented Aug 8, 2024

apostasie commented Aug 9, 2024

AkihiroSuda left a comment

go.mod update to containerd v2 #3173

go.mod update to containerd v2 #3173

Conversation

apostasie commented Jul 4, 2024 • edited Loading

apostasie commented Jul 4, 2024

apostasie commented Jul 9, 2024

apostasie commented Jul 10, 2024 • edited Loading

apostasie commented Jul 25, 2024

apostasie commented Jul 25, 2024 • edited Loading

AkihiroSuda commented Jul 26, 2024

apostasie commented Aug 6, 2024 • edited Loading

apostasie commented Aug 7, 2024

apostasie commented Aug 7, 2024

djdongjin Aug 7, 2024

Choose a reason for hiding this comment

apostasie Aug 8, 2024

Choose a reason for hiding this comment

djdongjin left a comment

Choose a reason for hiding this comment

apostasie commented Aug 8, 2024

apostasie commented Aug 9, 2024

AkihiroSuda left a comment

Choose a reason for hiding this comment

apostasie commented Jul 4, 2024 •

edited

Loading

apostasie commented Jul 10, 2024 •

edited

Loading

apostasie commented Jul 25, 2024 •

edited

Loading

apostasie commented Aug 6, 2024 •

edited

Loading