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.

Sign up for GitHub

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

Jump to bottom

Remove copied CRI and depend on CRI module #2966

Merged
merged 1 commit into from
Oct 21, 2021
Merged

Remove copied CRI and depend on CRI module #2966

merged 1 commit into from
Oct 21, 2021

Conversation

qiutongs
Copy link
Contributor

The copied CRI code failed build in K8s. So we decided to give up that way. In containerd-cri branch, it doesn't need copied CRI anymore.

@google-cla google-cla bot added the cla: yes label Oct 19, 2021
@k8s-ci-robot
Copy link
Collaborator

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

@bobbypage
Copy link
Collaborator

/ok-to-test

kolyshkin
kolyshkin reviewed Oct 20, 2021
View reviewed changes
build/boilerplate/boilerplate.py
@@ -95,7 +95,7 @@ def file_passes(filename, refs, regexs):
def file_extension(filename):
return os.path.splitext(filename)[1].split(".")[-1].lower()

skipped_dirs = ['Godeps', 'vendor', 'third_party', '_gopath', '_output', '.git', 'cri-api']
skipped_dirs = ['Godeps', 'vendor', 'third_party', '_gopath', '_output', '.git']
Copy link
Contributor

Choose a reason for hiding this comment

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

You can remove Godeps while at it. Obsoleted since commit 236f41d

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ok. I can remove it.

kolyshkin
kolyshkin approved these changes Oct 20, 2021
View reviewed changes
Copy link
Contributor

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

This is so much better than the previous hack! Could have helped me a lot with #2962.

LGTM (nb)

@kolyshkin kolyshkin mentioned this pull request Oct 20, 2021
Merged
@kolyshkin
Copy link
Contributor

Hmm, this was just added by #2938/#2944 (and #2956 in master) to avoid circular deps.

@qiutongs
Copy link
Contributor Author

Hmm, this was just added by #2938/#2944 (and #2956 in master) to avoid circular deps.

Yeah, but we encountered other problem when vendoring into k8s even with this hack. So we abandon that direction and this hack is no longer needed.

@bobbypage bobbypage merged commit f729479 into google:containerd-cri Oct 21, 2021
@snuggie12 snuggie12 mentioned this pull request May 7, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kolyshkin kolyshkin kolyshkin approved these changes

Assignees
No one assigned
Labels
cla: yes ok-to-test
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@qiutongs @k8s-ci-robot @bobbypage @kolyshkin