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

Switch from k8s utils/mount to moby/sys mount #2782

Merged
merged 1 commit into from
Jan 9, 2021

Conversation

mrajashree
Copy link
Contributor

@mrajashree mrajashree commented Jan 8, 2021

CAdvisor is vendored into kubernetes/kubernetes, so it cannot use staging
repositories as dependencies. The k8s.io/utils/mount is a staging repository.
This commit switches cAdvisor to use moby/sys/mountinfo instead of k8s.io/utils/mount to avoid
dependency issues.

@google-cla
Copy link

google-cla bot commented Jan 8, 2021

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@google-cla google-cla bot added the cla: no label Jan 8, 2021
@k8s-ci-robot
Copy link
Collaborator

Hi @mrajashree. 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.

@google-cla
Copy link

google-cla bot commented Jan 8, 2021

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@google-cla
Copy link

google-cla bot commented Jan 8, 2021

Thanks for your pull request. It looks like this may be your first contribution to a Google open source project (if not, look below for help). Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

📝 Please visit https://cla.developers.google.com/ to sign.

Once you've signed (or fixed any issues), please reply here with @googlebot I signed it! and we'll verify it.


What to do if you already signed the CLA

Individual signers
Corporate signers

ℹ️ Googlers: Go here for more info.

@mrajashree
Copy link
Contributor Author

@googlebot I signed it!

@google-cla google-cla bot added cla: yes and removed cla: no labels Jan 8, 2021
@mrajashree mrajashree changed the title Switch from k8s utils/mount to moby/sys mount [WIP] Switch from k8s utils/mount to moby/sys mount Jan 8, 2021
Copy link
Collaborator

@dims dims left a comment

Choose a reason for hiding this comment

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

Looks like a very straight forward rip and replace :)

thanks @mrajashree

@dims
Copy link
Collaborator

dims commented Jan 8, 2021

ouch TestDockerFilesystemStats failure

CAdvisor is vendored into kubernetes/kubernetes, so it cannot use staging
repositories as dependencies. The k8s utils/mount is a staging repository.
This commit switches cAdvisor to use moby/sys/mountinfo instead to avoid
dependency issues.
@mrajashree mrajashree changed the title [WIP] Switch from k8s utils/mount to moby/sys mount Switch from k8s utils/mount to moby/sys mount Jan 8, 2021
@mrajashree
Copy link
Contributor Author

/test pull-cadvisor-e2e

@k8s-ci-robot
Copy link
Collaborator

@mrajashree: Cannot trigger testing until a trusted user reviews the PR and leaves an /ok-to-test message.

In response to this:

/test pull-cadvisor-e2e

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.

@dims
Copy link
Collaborator

dims commented Jan 9, 2021

/ok-to-test

@mrajashree
Copy link
Contributor Author

@dims tests are all clear now 👍

@bobbypage
Copy link
Collaborator

bobbypage commented Jan 9, 2021

Looks great, thanks for doing this! LGTM

/cc @brahmaroutu

@bobbypage bobbypage merged commit c09d1ab into google:master Jan 9, 2021
@brahmaroutu
Copy link
Contributor

Awesome, thanks for the effort, @mrajashree @dims @bobbypage for taking this on. I can now proceed to update the k8s vendoring to remove utils/mount once the cAdvisor version is updated.

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.

5 participants