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.

Sign up for GitHub

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

Jump to bottom

Upgrade to containerd 2 #5507

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Upgrade to containerd 2 #5507

wants to merge 2 commits into from
+53,834 −24,055

Conversation

slonopotamus
Copy link
Contributor

@slonopotamus slonopotamus commented Nov 10, 2024 •
edited
Loading

This PR depends on

Non-import changes:

  1. stargz-snapshotter dependency was bumped to unreleased commit because of containerd api changes v0.16.2
  2. fuse-overlayfs-snapshotter dependency was bumped to v2.0.0
  3. Several more deps were automatically updated by go mod tidy
  4. ExpiresIn was changed to ExpiresInSeconds in authprovider.go
  5. Workaround for archive: use 1970-01-01 as the whiteout timestamp containerd/containerd#8764 was removed in overlay_linux.go
  6. Minor code cleanup in main_containerd_worker_windows.go
  7. Adjusted expected string in testUndeclaredArg in dockerfile_lint_test.go
  8. I dropped testSchema1Image test. It is very nontrivial to push CONTAINERD_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=1 env variable from a single place to both rootful and rootless tests (if you know such place, tell me!). Schema v1 is going away in containerd 2.1 anyway. buildkit still supports in currently. If this change is unacceptable... Well, need more time to find where exactly to put CONTAINERD_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=1 in buildkit test framework.

Closes #5514

@slonopotamus slonopotamus force-pushed the containerd-2 branch 10 times, most recently from a1ee378 to 11d49af Compare November 10, 2024 15:15
@slonopotamus slonopotamus marked this pull request as ready for review November 10, 2024 15:16
@slonopotamus
Copy link
Contributor Author

Yes, it is a v0.18.0 -> v0.19.0 buildx regression (confirmed by forcing buildx v0.18.0: 9ee4998), completely unrelated to my changes. And this means all your CI is gonna fail starting from https://github.com/docker/buildx/releases/tag/v0.19.0

@crazy-max
Copy link
Member

crazy-max commented Nov 27, 2024 •
edited
Loading

Yes we just revert the bump to latest Buildx stable in our actions in the meantime while this is being investigated: docker/actions-toolkit#508

You can remove the last commit

@slonopotamus
Copy link
Contributor Author

You can remove the last commit

Done

@github-actions github-actions bot removed the area/ci label Nov 27, 2024
@slonopotamus slonopotamus force-pushed the containerd-2 branch 2 times, most recently from 8171c16 to d31d4dc Compare November 27, 2024 11:20
@slonopotamus
Copy link
Contributor Author

Test failure is #5391, unrelated to changes in current PR.

@ktock ktock mentioned this pull request Nov 27, 2024
Merged
dmcgowan
dmcgowan approved these changes Dec 9, 2024
View reviewed changes
Copy link
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this is ready to get in here and subsequently in moby/moby

@slonopotamus
Copy link
Contributor Author

Rebased to resolve conflicts.

@slonopotamus slonopotamus force-pushed the containerd-2 branch 2 times, most recently from 5fd22f1 to 8c7af4f Compare December 19, 2024 09:10
@AkihiroSuda
Copy link
Member

Needs rebase again

@slonopotamus slonopotamus force-pushed the containerd-2 branch 5 times, most recently from 9098dec to 04efbe7 Compare January 8, 2025 13:31
@AkihiroSuda
Copy link
Member

@tonistiigi PTAL

@AkihiroSuda
Copy link
Member

Needs rebase again 😥

slonopotamus and others added 2 commits January 10, 2025 20:16
@slonopotamus
Drop schema v1 test
8425ff1 
Schema v1 support will be removed in containerd-2.1.

While we continue to support it when containerd is launched with CONTAINERD_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=1 env variable, the effort to keep the test working isn't worth it.

Signed-off-by: Marat Radchenko <[email protected]>
@slonopotamus @dmcgowan
Upgrade to containerd 2
486a301 
Co-authored-by: Derek McGowan <[email protected]>
Signed-off-by: Marat Radchenko <[email protected]>
@slonopotamus
Copy link
Contributor Author

Rebased again...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ktock ktock ktock left review comments

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@dmcgowan dmcgowan dmcgowan approved these changes

@crazy-max crazy-max Awaiting requested review from crazy-max

@tonistiigi tonistiigi Awaiting requested review from tonistiigi

Requested changes must be addressed to merge this pull request.

Assignees

@tonistiigi tonistiigi

Labels
area/buildctl area/buildkitd area/client area/dependencies Pull requests that update a dependency file area/dockerfile area/examples area/executor area/exporter area/frontend area/llb area/remotecache area/session area/solver area/source area/testing area/util area/worker
Projects
None yet
Milestone
v0.19.0
Development

Successfully merging this pull request may close these issues.

Upgrade to containerd 2.0
7 participants
@slonopotamus @dmcgowan @AkihiroSuda @crazy-max @ktock @tonistiigi @thompson-shaun