Skip to content

go.mod: re-vendor NRI from the official repo.#7744

Merged
mikebrow merged 1 commit intocontainerd:mainfrom
klihub:dont-divert-nri-repo
Dec 2, 2022
Merged

go.mod: re-vendor NRI from the official repo.#7744
mikebrow merged 1 commit intocontainerd:mainfrom
klihub:dont-divert-nri-repo

Conversation

@klihub
Copy link
Copy Markdown
Member

@klihub klihub commented Dec 1, 2022

There is no need to divert the NRI repository. Remove replace rule and re-vendor it from the official repository.

@k8s-ci-robot
Copy link
Copy Markdown

k8s-ci-robot commented Dec 1, 2022

Hi @klihub. Thanks for your PR.

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

Details

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.

@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Dec 1, 2022

/ok-to-test

mikebrow
mikebrow reviewed Dec 1, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

couple spots in NRI.md doc :-)

e.g.: https://github.com/containerd/containerd/blame/main/docs/NRI.md#L112

@klihub klihub force-pushed the dont-divert-nri-repo branch 2 times, most recently from 8d277cf to cd315e0 Compare December 2, 2022 08:12
estesp
estesp reviewed Dec 2, 2022
View reviewed changes
Comment thread docs/NRI.md Outdated
@mxpv
Copy link
Copy Markdown
Member

mxpv commented Dec 2, 2022

@klihub not related to this PR particularly. Do you think it'd be possible to port NRI work to sbserver as well?

mxpv
mxpv approved these changes Dec 2, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@mxpv mxpv left a comment

Choose a reason for hiding this comment

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

LGTM after wording nits.

@klihub
Copy link
Copy Markdown
Member Author

klihub commented Dec 2, 2022

@klihub not related to this PR particularly. Do you think it'd be possible to port NRI work to sbserver as well?

Definitely, and it is on our TODO list.

@klihub klihub force-pushed the dont-divert-nri-repo branch from cd315e0 to 740e901 Compare December 2, 2022 17:09
@mikebrow
Copy link
Copy Markdown
Member

mikebrow commented Dec 2, 2022

@klihub not related to this PR particularly. Do you think it'd be possible to port NRI work to sbserver as well?

Definitely, and it is on our TODO list.

a diff of the nri log plugin output between sbserver and server will be a great proof point...

mikebrow
mikebrow approved these changes Dec 2, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@mikebrow mikebrow left a comment

Choose a reason for hiding this comment

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

LGTM on green

estesp
estesp approved these changes Dec 2, 2022
View reviewed changes
Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

@mikebrow mikebrow merged commit c0a89fb into containerd:main Dec 2, 2022
@klihub klihub deleted the dont-divert-nri-repo branch December 2, 2022 19:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@dmcgowan dmcgowan dmcgowan approved these changes

@mxpv mxpv mxpv approved these changes

@estesp estesp estesp approved these changes

@mikebrow mikebrow mikebrow approved these changes

@fuweid fuweid fuweid approved these changes

Assignees

No one assigned

Labels

ok-to-test

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@klihub @k8s-ci-robot @mikebrow @mxpv @dmcgowan @estesp @fuweid