Skip to content

mod: bump github.com/containerd/[email protected]#10089

Merged
kzys merged 1 commit intocontainerd:mainfrom
samuelkarp:bump-nri-v0.6.1
Apr 18, 2024
Merged

mod: bump github.com/containerd/[email protected]#10089
kzys merged 1 commit intocontainerd:mainfrom
samuelkarp:bump-nri-v0.6.1

Conversation

@samuelkarp
Copy link
Member

@samuelkarp samuelkarp commented Apr 18, 2024

Fixes #10085

@samuelkarp
Copy link
Member Author

samuelkarp commented Apr 18, 2024

cc @acurtiz @bobbypage

@samuelkarp samuelkarp added impact/changelog dependencies Pull requests that update a dependency file cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch area/nri Node Resource Interface (NRI) labels Apr 18, 2024
@bobbypage
Copy link
Contributor

bobbypage commented Apr 18, 2024

LGTM

@kzys kzys added this pull request to the merge queue Apr 18, 2024
@samuelkarp
Copy link
Member Author

samuelkarp commented Apr 18, 2024

/cherrypick release/1.7

(Not sure this will work, but at least I can try...)

@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Apr 18, 2024

@samuelkarp: once the present PR merges, I will cherry-pick it on top of release/1.7 in a new PR and assign it to you.

Details

In response to this:

/cherrypick release/1.7

(Not sure this will work, but at least I can try...)

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.

@samuelkarp
Copy link
Member Author

samuelkarp commented Apr 18, 2024

I expect the automated cherrypick to fail because it won't also update integration/client. I'll prep a manual cherrypick as well.

Merged via the queue into containerd:main with commit 6e0dc9f Apr 18, 2024
@k8s-infra-cherrypick-robot
Copy link

k8s-infra-cherrypick-robot commented Apr 18, 2024

@samuelkarp: #10089 failed to apply on top of branch "release/1.7":

Applying: mod: bump github.com/containerd/[email protected]
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
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
Patch failed at 0001 mod: bump github.com/containerd/[email protected]
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Details

In response to this:

/cherrypick release/1.7

(Not sure this will work, but at least I can try...)

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.

This was referenced Apr 19, 2024
Closed
Merged
@dims dims mentioned this pull request Jul 16, 2024
Merged
@samuelkarp samuelkarp added cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch and removed cherry-pick/1.7.x Change to be cherry picked to release/1.7 branch labels Jul 31, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kzys kzys kzys approved these changes

@dcantah dcantah dcantah approved these changes

Assignees

No one assigned

Labels

area/nri Node Resource Interface (NRI) cherry-picked/1.7.x PR commits are cherry-picked into release/1.7 branch dependencies Pull requests that update a dependency file size/S

Projects

Pull Request Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

NRI plugin registration can trigger a deadlock

7 participants

@samuelkarp @bobbypage @k8s-infra-cherrypick-robot @kzys @dcantah @dmcgowan @k8s-ci-robot