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

Update containerd to v1.6.20 #15319

Merged

Conversation

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Apr 15, 2023
@k8s-ci-robot k8s-ci-robot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Apr 15, 2023
@k8s-ci-robot
Copy link
Contributor

Hi @anthonyhaussman. Thanks for your PR.

I'm waiting for a kubernetes 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.

@k8s-ci-robot k8s-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Apr 15, 2023
@anthonyhaussman anthonyhaussman marked this pull request as ready for review April 15, 2023 10:13
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Apr 15, 2023
@hakman
Copy link
Member

hakman commented Apr 15, 2023

/ok-to-test

@k8s-ci-robot k8s-ci-robot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Apr 15, 2023
@hakman
Copy link
Member

hakman commented Apr 16, 2023

@anthonyhaussman This looks good. Could you split the Go part into a separate commit, like in https://github.com/kubernetes/kops/pull/15159/commits? It would make it easier to cherry-pick.

@anthonyhaussman
Copy link
Contributor Author

@anthonyhaussman This looks good. Could you split the Go part into a separate commit, like in https://github.com/kubernetes/kops/pull/15159/commits? It would make it easier to cherry-pick.

It's done @hakman 🙂

@hakman
Copy link
Member

hakman commented Apr 16, 2023

Thanks @anthonyhaussman!
/retest

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Apr 16, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: hakman

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Apr 16, 2023
@hakman
Copy link
Member

hakman commented Apr 16, 2023

/retest

@k8s-triage-robot
Copy link

The Kubernetes project has merge-blocking tests that are currently too flaky to consistently pass.

This bot retests PRs for certain kubernetes repos according to the following rules:

  • The PR does have any do-not-merge/* labels
  • The PR does not have the needs-ok-to-test label
  • The PR is mergeable (does not have a needs-rebase label)
  • The PR is approved (has cncf-cla: yes, lgtm, approved labels)
  • The PR is failing tests required for merge

You can:

/retest

1 similar comment
@k8s-triage-robot
Copy link

The Kubernetes project has merge-blocking tests that are currently too flaky to consistently pass.

This bot retests PRs for certain kubernetes repos according to the following rules:

  • The PR does have any do-not-merge/* labels
  • The PR does not have the needs-ok-to-test label
  • The PR is mergeable (does not have a needs-rebase label)
  • The PR is approved (has cncf-cla: yes, lgtm, approved labels)
  • The PR is failing tests required for merge

You can:

/retest

@rifelpet
Copy link
Member

/hold the e2e jobs are failing until the credential provider is fixed and released in cloud-provider-aws

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 17, 2023
@olemarkus
Copy link
Member

It's been released, but kOps needs to start supporting downloading and using it. The credentials provider is also not really tested upstream, so there may be more work needed there as well.

Currently working on what's needed kOps-side and will then add e2e in the aws cloud provider.

@hakman
Copy link
Member

hakman commented Apr 17, 2023

@rifelpet @olemarkus Should we maybe make these 2 tests optional for now?

@rifelpet
Copy link
Member

How about reverting the deps update? That way the head of master is not broken

@olemarkus
Copy link
Member

The problem is that the functionality for pulling ECR-containers are removed from kubelet. So we'd have to run these tests with K8s 1.26 instead. Which I am not necessarily against. If the ECR credentials provider is also broken, we won't get the PR to start using it into the repo either.

@rifelpet
Copy link
Member

If we know k8s 1.27 doesn't work with kops yet then temporarily pinning our presubmit tests to k8s 1.26 seems reasonable

@hakman
Copy link
Member

hakman commented Apr 19, 2023

/test all

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Apr 19, 2023

@anthonyhaussman: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
pull-kops-e2e-cni-amazonvpc a28b11f link false /test pull-kops-e2e-cni-amazonvpc
pull-kops-e2e-cni-kuberouter a28b11f link false /test pull-kops-e2e-cni-kuberouter

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

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. I understand the commands that are listed here.

@hakman
Copy link
Member

hakman commented Apr 19, 2023

/test pull-kops-e2e-cni-flannel

@hakman
Copy link
Member

hakman commented Apr 19, 2023

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 19, 2023
@k8s-ci-robot k8s-ci-robot merged commit 5f989ff into kubernetes:master Apr 19, 2023
@anthonyhaussman anthonyhaussman deleted the feat/kops/containerd-v1.6.20 branch April 19, 2023 11:28
k8s-ci-robot added a commit that referenced this pull request May 13, 2023
…15358-#15378-upstream-release-1.26

Automated cherry pick of #15319: Update containerd to v1.6.20
#15358: update runc to 1.1.7
#15378: Update containerd to v1.6.21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. ok-to-test Indicates a non-member PR verified by an org member that is safe to test. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants