Update to containerd 2.0 #4630
Update to containerd 2.0 #4630
Conversation
dmcgowan
force-pushed
the
update-containerd-2.0
branch
from
d3986e5
to
1f9aaf1
Compare
github-actions
bot
added
area/dockerfile
area/llb
area/testing
area/dependencies
dmcgowan
force-pushed
the
update-containerd-2.0
branch
from
1f9aaf1
to
87a00b5
Compare
dmcgowan
force-pushed
the
update-containerd-2.0
branch
4 times, most recently
from
b10c43a
to
e31951e
Compare
This is a prerequisite to upgrading to containerd 2.x See containerd/typeurl#54 Signed-off-by: Marat Radchenko <[email protected]>
Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Akihiro Suda <[email protected]>
Signed-off-by: Marat Radchenko <[email protected]>
dmcgowan
force-pushed
the
update-containerd-2.0
branch
from
e31951e
to
47809ed
Compare
dmcgowan
force-pushed
the
update-containerd-2.0
branch
from
47809ed
to
b6a8c1f
Compare
client/client_test.go
Outdated
| @@ -224,6 +225,7 @@ var allTests = []func(t *testing.T, sb integration.Sandbox){ | |||
| } | |||
|
|
|||
| func TestIntegration(t *testing.T) { | |||
| t.Setenv("CONTAINERD_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE", "1") | |||
There was a problem hiding this comment.
Huh, rootless still fails. And if you want to set variable here, you want to remove my workaround from hack/test.
There was a problem hiding this comment.
Yeah, will have to try something else
There was a problem hiding this comment.
Okay, I think I know what's the problem with rootless tests. Look at this code: https://github.com/moby/buildkit/blob/master/util/testutil/workers/containerd.go#L183-L190
I think it blocks propagation of env variables from parent process.
There was a problem hiding this comment.
Yep. Unless sudo is called with -E/--preserve-env, it uses a brand-new environment. Note that I am not sure it is a good idea to use these flags. Possibly we should just add CONTAINERD_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=1 to c.ExtraEnv.
There was a problem hiding this comment.
We can add it there if we want to support it, it should be removed soon entirely anyway
There was a problem hiding this comment.
Do we still need to support Schema 1 on our CI?
There was a problem hiding this comment.
That's a good question. There's only a single test that deliberately tests schema v1. But it's up to you, maintainers, to decide. As just a contributor, I am trying to go conservative route by preserving whatever functionality existed before my changes until explicit "yeah, burn it" is said :)
There was a problem hiding this comment.
I added a skip to see if it makes it go green. If it was up to me, I would vote to mark it as deprecated and remove the CI for it.
Signed-off-by: Derek McGowan <[email protected]>
dmcgowan
force-pushed
the
update-containerd-2.0
branch
from
b6a8c1f
to
d0432c0
Compare
This is testing against beta, opening now to see if there are any glaring issues we should consider before 2.0 final. We plan on stabilizing the Go interface in 2.0 so future versions shouldn't require many code changes that are included here.
Requires
#4558
containerd/stargz-snapshotter#1545
containerd/fuse-overlayfs-snapshotter#72