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.

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

[release/1.6] cherry-pick: Update k8s.io/cri-api to v0.25.0 #7411

Closed

Conversation

ruiwen-zhao
Copy link
Member

This PR backports #7287 to release 1.6, which will be needed to support multiple feature works in Kubernetes.

When cherry-picking commits, I

  1. resolved conflicts in go.mod and integration/client/go.mod, by keeping every the same as HEAD of release/1.6 except changing cri-api to k8s.io/cri-api v0.25.0-alpha.3.0.20220803042751-33bb7ae0d927.
  2. ran go mod tidy and go mod vendor under root dir.
  3. ran go mod tidy under integration/client/.

Note that this PR does NOT build because it does not have implementations of the new CRI methods added (CheckpointContainer etc). The implementation is added in #7410, so we will need to merge #7410 to release/1.6 first, and then rebase this PR.

Signed-off-by: zounengren <zouyee1989@gmail.com>
Signed-off-by: zounengren <zouyee1989@gmail.com>
@k8s-ci-robot
Copy link

Hi @ruiwen-zhao. Thanks for your PR.

I'm waiting for a containerd member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants