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.

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

[release-1.0] Bump golang.org/x/net to address CVE-2024-45338 #1194

Closed
kmesh-bot opened this issue Jan 16, 2025 · 3 comments
Closed

[release-1.0] Bump golang.org/x/net to address CVE-2024-45338 #1194

kmesh-bot opened this issue Jan 16, 2025 · 3 comments
Assignees

Comments

@kmesh-bot
Copy link
Collaborator

Manual cherrypick required.

#1193 failed to apply on top of branch "release-1.0":

Applying: BUmp golang.org/x/net to address cve
Using index info to reconstruct a base tree...
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging 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 BUmp golang.org/x/net to address cve
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".

@hzxuzhonghu
Copy link
Member

/lgtm
/approve

@LiZhenCheng9527
Copy link
Collaborator

Done
/close

@kmesh-bot
Copy link
Collaborator Author

@LiZhenCheng9527: Closing this issue.

In response to this:

Done
/close

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

3 participants