Closed khrm closed 5 months ago
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: vdemeester
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/assign @sayan-biswas @avinal Let's merge this. We need to do a patch release.
Version bump only. Seems good to me. /lgtm
/cherry-pick @release-0.9.x
@khrm: cannot checkout @release-0.9.x
: error checking out @release-0.9.x: exit status 1. output: error: pathspec '@release-0.9.x' did not match any file(s) known to git
/cherry-pick release-0.9.x
@khrm: cannot checkout release-0.9.x
: error checking out release-0.9.x: exit status 1. output: error: pathspec 'release-0.9.x' did not match any file(s) known to git
/cherry-pick release-v0.9.x
@khrm: #746 failed to apply on top of branch "release-v0.9.x":
Applying: Update golang.org/x/net to handle CVE GO-2024-2687
Using index info to reconstruct a base tree...
M go.mod
M go.sum
M vendor/golang.org/x/net/http2/frame.go
M vendor/golang.org/x/sys/unix/ztypes_linux.go
M vendor/golang.org/x/sys/windows/syscall_windows.go
M vendor/golang.org/x/sys/windows/zsyscall_windows.go
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 vendor/golang.org/x/sys/windows/zsyscall_windows.go
Auto-merging vendor/golang.org/x/sys/windows/syscall_windows.go
Auto-merging vendor/golang.org/x/sys/unix/ztypes_linux.go
Auto-merging vendor/golang.org/x/net/http2/frame.go
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 Update golang.org/x/net to handle CVE GO-2024-2687
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".
Ref: https://pkg.go.dev/vuln/GO-2024-2687
Changes
Submitter Checklist
These are the criteria that every PR should meet, please check them off as you review them:
/kind <type>
. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tepRelease Notes