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

[release/2.0] Update go-cni version to fix Race Condition issue #11269

Merged
merged 1 commit into from
Feb 5, 2025
Merged

[release/2.0] Update go-cni version to fix Race Condition issue #11269

merged 1 commit into from
Feb 5, 2025

Conversation

MikeZappa87
Copy link
Contributor

@MikeZappa87 MikeZappa87 commented Jan 16, 2025 •
edited by samuelkarp
Loading

Manual cherry-pick of #11244

Merging containerd/go-cni#126 to fix race conditon in go-cni.

@k8s-ci-robot
Copy link

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

@buroa buroa mentioned this pull request Jan 16, 2025
Closed
@MikeZappa87 MikeZappa87 requested a review from mikebrow January 21, 2025 22:07
@MikeZappa87 MikeZappa87 marked this pull request as ready for review January 24, 2025 23:25
@dosubot dosubot bot added dependencies Pull requests that update a dependency file go Pull requests that update Go code labels Jan 24, 2025
@MikeZappa87 MikeZappa87 changed the title update go-cni for race condition fix Update go-cni version to fix Race Condition issue Jan 24, 2025
mikebrow
mikebrow approved these changes Jan 27, 2025
View reviewed changes
Copy link
Member

@mikebrow mikebrow left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM just a title & header edit

@mikebrow mikebrow added the area/cri Container Runtime Interface (CRI) label Jan 27, 2025
@mikebrow
Copy link
Member

mikebrow commented Jan 27, 2025 •
edited
Loading

This is a manual cherry from main... auto cherry failed 3way diff (Auto-merging go.mod)

@MikeZappa87 can you edit the title and header to indicate this is a manual cherry pick? Example: #10682

@samuelkarp samuelkarp changed the title Update go-cni version to fix Race Condition issue [release/2.0] Update go-cni version to fix Race Condition issue Jan 29, 2025
@samuelkarp samuelkarp mentioned this pull request Jan 29, 2025
Closed
@samuelkarp
Copy link
Member

I added [release/2.0] to the issue title and adjusted the description, but the commit messages differ between 09bf281 (on main) and a3104c8 in this PR. @MikeZappa87, do you mind adjusting to match the first line and then indicate the source of the cherry-pick in a subsequent line of the commit message?

@MikeZappa87
Copy link
Contributor Author

I added [release/2.0] to the issue title and adjusted the description, but the commit messages differ between 09bf281 (on main) and a3104c8 in this PR. @MikeZappa87, do you mind adjusting to match the first line and then indicate the source of the cherry-pick in a subsequent line of the commit message?

Done! Sorry just getting to this

@MikeZappa87
Copy link
Contributor Author

/test pull-containerd-node-e2e

3 similar comments
@MikeZappa87
Copy link
Contributor Author

/test pull-containerd-node-e2e

@MikeZappa87
Copy link
Contributor Author

/test pull-containerd-node-e2e

@MikeZappa87
Copy link
Contributor Author

/test pull-containerd-node-e2e

@MikeZappa87
Copy link
Contributor Author

@mikebrow looks like upstream fixed the issue and all tests are passing

@MikeZappa87
Copy link
Contributor Author

/test pull-containerd-node-e2e

@MikeZappa87
fix go-cni race condition
06891f8 
Signed-off-by: Michael Zappa <[email protected]>
mikebrow
mikebrow approved these changes Feb 5, 2025
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 merged commit 29be12a into containerd:release/2.0 Feb 5, 2025
58 checks passed
This was referenced Feb 21, 2025
Merged
Merged
Merged
Merged
Merged
Merged
@dmcgowan dmcgowan mentioned this pull request Feb 27, 2025
Merged
@github-actions github-actions bot mentioned this pull request Mar 2, 2025
Open
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

@mikebrow mikebrow mikebrow approved these changes

@laurazard laurazard Awaiting requested review from laurazard

Assignees
No one assigned
Labels
area/cri Container Runtime Interface (CRI) dependencies Pull requests that update a dependency file go Pull requests that update Go code size/XXL
Projects
Pull Request Review
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@MikeZappa87 @k8s-ci-robot @mikebrow @samuelkarp @dmcgowan @laurazard