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
+54,034 −24,660

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.1
  2. fuse-overlayfs-snapshotter dependency was bumped to v2.0.0
  3. ExpiresIn was changed to ExpiresInSeconds in authprovider.go
  4. Workaround for archive: use 1970-01-01 as the whiteout timestamp containerd/containerd#8764 was removed in overlay_linux.go
  5. Minor code cleanup in main_containerd_worker_windows.go
  6. Adjusted expected string in testUndeclaredArg in dockerfile_lint_test.go
  7. 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
@dmcgowan
Copy link
Member

Is this related to the change though?

        	Error:      	Error message not equal:
        	            	expected: "failed to solve: empty platform value from expression $BULIDPLATFORM (did you mean BUILDPLATFORM?)"
        	            	actual  : "failed to run Build function: empty platform value from expression $BULIDPLATFORM (did you mean BUILDPLATFORM?)"

Otherwise it is looking good, I'll close my other PR in favor of this one

dmcgowan
dmcgowan reviewed Nov 13, 2024
View reviewed changes
go.mod Outdated Show resolved Hide resolved
@slonopotamus
Copy link
Contributor Author

Is this related to the change though?

Not sure yet.

@slonopotamus slonopotamus force-pushed the containerd-2 branch 4 times, most recently from f7fdc5d to c4cda61 Compare November 14, 2024 07:31
@slonopotamus
Copy link
Contributor Author

slonopotamus commented Nov 14, 2024 •
edited
Loading

Hmm... We're green on CI?

@thompson-shaun thompson-shaun added this to the v0.future milestone Nov 14, 2024
@dmcgowan dmcgowan mentioned this pull request Nov 14, 2024
Draft
@slonopotamus
Copy link
Contributor Author

Rebased on top of updated version of #5463

@thompson-shaun thompson-shaun modified the milestones: v0.future, v0.19.0 Nov 15, 2024
@github-actions github-actions bot removed the area/ci label Nov 16, 2024
@slonopotamus
Copy link
Contributor Author

Rebased on top of master to use merged version of #5463

@slonopotamus
Copy link
Contributor Author

slonopotamus commented Nov 16, 2024 •
edited
Loading

Failure of TestRuleCheckOption test is not related to my changes, it is flaky: #5391

@AkihiroSuda
Copy link
Member

Needs rebase

@slonopotamus
Drop schema v1 test
9928142 
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 <marat@slonopotamus.org>
@slonopotamus @dmcgowan
Upgrade to containerd 2
8ba889b 
Co-authored-by: Derek McGowan <derek@mcg.dev>
Signed-off-by: Marat Radchenko <marat@slonopotamus.org>
@slonopotamus
Copy link
Contributor Author

Rebased to resolve conflicts.

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

@dmcgowan dmcgowan dmcgowan left review comments

At least 1 approving review is required to merge this pull request.

Assignees
No one assigned
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
4 participants
@slonopotamus @dmcgowan @AkihiroSuda @thompson-shaun