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

Add kubernetes/cri-api to cAdvisor #2938

Merged
merged 2 commits into from
Sep 21, 2021

Conversation

bobbypage
Copy link
Collaborator

@bobbypage bobbypage commented Sep 15, 2021

Add script that will copy https://github.com/kubernetes/cri-api/ directly in cAdvisor tree.

This is used to avoid adding cri-api as go module. This is not possible due to cri-api being in k/k staging repo. Since cAdvisor is also vendored back into k/k this would result in circular dependency. Copying CRI proto definitions is workaround for this issue.

  • Add presubmit to ensure that copied cri-version matches github version - ./build/check_cri_defs.sh
  • Running ./build/update_cri_defs.sh can update the CRI definitions

@google-cla google-cla bot added the cla: yes label Sep 15, 2021
@bobbypage
Copy link
Collaborator Author

/cc @qiutongs

@bobbypage bobbypage changed the base branch from master to containerd-cri September 16, 2021 21:34
@bobbypage bobbypage changed the base branch from containerd-cri to master September 16, 2021 21:34
@bobbypage bobbypage changed the base branch from master to containerd-cri September 17, 2021 22:30
@google-cla
Copy link

google-cla bot commented Sep 17, 2021

All (the pull request submitter and all commit authors) CLAs are signed, but one or more commits were authored or co-authored by someone other than the pull request submitter.

We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that by leaving a comment that contains only @googlebot I consent. in this pull request.

Note to project maintainer: There may be cases where the author cannot leave a comment, or the comment is not properly detected as consent. In those cases, you can manually confirm consent of the commit author(s), and set the cla label to yes (if enabled on your project).

ℹ️ Googlers: Go here for more info.

@google-cla google-cla bot added cla: no and removed cla: yes labels Sep 17, 2021
@google-cla google-cla bot removed the cla: no label Sep 17, 2021
@bobbypage bobbypage changed the title [WIP] Add kubernetes/cri-api to cAdvisor Add kubernetes/cri-api to cAdvisor Sep 17, 2021
@bobbypage
Copy link
Collaborator Author

/retest

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

Successfully merging this pull request may close these issues.

2 participants