Skip to content

Update go-cni for CNI STATUS#11135

Merged
mikebrow merged 1 commit intocontainerd:mainfrom
MikeZappa87:feat/cnistatus
Dec 11, 2024
Merged

Update go-cni for CNI STATUS#11135
mikebrow merged 1 commit intocontainerd:mainfrom
MikeZappa87:feat/cnistatus

Conversation

@MikeZappa87
Copy link
Member

@MikeZappa87 MikeZappa87 commented Dec 11, 2024 •
edited
Loading

This PR updates go-cni with the latest version. It provides the CNI Status verb. To make use of this new verb users will need to specify the CNI Version 1.1.0 in the CNI Configuration.

@k8s-ci-robot
Copy link

k8s-ci-robot commented Dec 11, 2024

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@MikeZappa87 MikeZappa87 force-pushed the feat/cnistatus branch 2 times, most recently from c756d11 to ceb3d77 Compare December 11, 2024 02:43
@MikeZappa87 MikeZappa87 marked this pull request as ready for review December 11, 2024 15:42
@dosubot dosubot bot added the dependencies Pull requests that update a dependency file label Dec 11, 2024
@MikeZappa87 MikeZappa87 requested a review from mikebrow December 11, 2024 16:39
mikebrow
mikebrow approved these changes Dec 11, 2024
View reviewed changes
Copy link
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

@mikebrow mikebrow added this pull request to the merge queue Dec 11, 2024
Merged via the queue into containerd:main with commit 41bc049 Dec 11, 2024
@mikebrow mikebrow added the cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch label Dec 11, 2024
@mikebrow
Copy link
Member

mikebrow commented Dec 11, 2024

/cherrypick release/2.0

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Dec 11, 2024

@mikebrow: new pull request created: #11146

Details

In response to this:

/cherrypick release/2.0

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-sigs/prow repository.

@k8s-infra-cherrypick-robot k8s-infra-cherrypick-robot mentioned this pull request Dec 11, 2024
Merged
@MikeZappa87
Copy link
Member Author

MikeZappa87 commented Dec 12, 2024

/cherrypick release/1.7

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Dec 12, 2024

@MikeZappa87: only containerd org members may request cherry picks. If you are already part of the org, make sure to change your membership to public. Otherwise you can still do the cherry-pick manually.

Details

In response to this:

/cherrypick release/1.7

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-sigs/prow repository.

@MikeZappa87
Copy link
Member Author

MikeZappa87 commented Dec 12, 2024

@mikebrow I am not cool and cannot cherry pick

@dims
Copy link
Member

dims commented Dec 12, 2024

/cherrypick release/1.7

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Dec 12, 2024

@dims: #11135 failed to apply on top of branch "release/1.7":

Applying: feat: update go-cni version for CNI STATUS
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
M	vendor/modules.txt
Falling back to patching base and 3-way merge...
Auto-merging vendor/modules.txt
CONFLICT (content): Merge conflict in vendor/modules.txt
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 feat: update go-cni version for CNI STATUS
Details

In response to this:

/cherrypick release/1.7

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-sigs/prow repository.

@dims
Copy link
Member

dims commented Dec 12, 2024

@MikeZappa87 doesn't apply cleanly :( need to file one by hand i guess

@dmcgowan dmcgowan added cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch and removed cherry-pick/2.0.x Change to be cherry picked to release/2.0 branch labels Dec 12, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

@mikebrow mikebrow mikebrow approved these changes

Assignees

No one assigned

Labels

cherry-picked/2.0.x PR commits are cherry picked into the release/2.0 branch dependencies Pull requests that update a dependency file size/L

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@MikeZappa87 @k8s-ci-robot @mikebrow @k8s-infra-cherrypick-robot @dims @AkihiroSuda @dmcgowan