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

Updating containerd version #2367

Closed
wants to merge 1 commit into from

Conversation

eweber9858
Copy link

In order to vendor in this PR (microsoft/hcsshim#730) to kubernetes, the containerd/containerd dependency must also be upgraded to a newer version (github.com/containerd/containerd v1.3.0-beta.2.0.20190828155532-0293cbd26c69). This newer version is incompatible with google/cadvisor because of this commit, where the github.com/containerd/containerd/dialer package was moved to github.com/containerd/containerd/pkg/dialer. This change in path is disruptive to google/cadvisor because the dialer package is imported in container/containerd/client.go.

This PR bumps the containerd version to v1.2.0, which is one of the earliest releases of containerd with the needed change (another option is to bump to the latest version, v1.3.2)

@k8s-ci-robot
Copy link
Collaborator

Hi @eweber9858. Thanks for your PR.

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

@eweber9858
Copy link
Author

@dashpole PTAL

@dashpole
Copy link
Collaborator

dashpole commented Jan 6, 2020

/ok-to-test

@dashpole
Copy link
Collaborator

dashpole commented Jan 6, 2020

cc @Random-Liu

@k8s-ci-robot
Copy link
Collaborator

@eweber9858: The following test failed, say /retest to rerun all failed tests:

Test name Commit Details Rerun command
pull-cadvisor-e2e e95d9ef link /test pull-cadvisor-e2e

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.

@dashpole
Copy link
Collaborator

dashpole commented Jan 7, 2020

You will need to rebase on top of #2370 to fix the test.

@dashpole
Copy link
Collaborator

dashpole commented Jan 8, 2020

This should no longer be needed. The containerd version was updated past this point in #2372

@dashpole dashpole closed this Jan 8, 2020
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.

3 participants