tektoncd / results

Long term storage of execution results.
Apache License 2.0
77 stars 73 forks source link

Update golang.org/x/net to handle CVE GO-2024-2687 #746

Closed khrm closed 5 months ago

khrm commented 5 months ago

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:

Release Notes

tekton-robot commented 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

Needs approval from an approver in each of these files: - ~~[OWNERS](https://github.com/tektoncd/results/blob/main/OWNERS)~~ [vdemeester] Approvers can indicate their approval by writing `/approve` in a comment Approvers can cancel approval by writing `/approve cancel` in a comment
khrm commented 5 months ago

/assign @sayan-biswas @avinal Let's merge this. We need to do a patch release.

avinal commented 5 months ago

Version bump only. Seems good to me. /lgtm

khrm commented 5 months ago

/cherry-pick @release-0.9.x

tekton-robot commented 5 months ago

@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

In response to [this](https://github.com/tektoncd/results/pull/746#issuecomment-2045082593): >/cherry-pick @release-0.9.x Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
khrm commented 5 months ago

/cherry-pick release-0.9.x

tekton-robot commented 5 months ago

@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

In response to [this](https://github.com/tektoncd/results/pull/746#issuecomment-2045084529): > >/cherry-pick release-0.9.x > > Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.
khrm commented 5 months ago

/cherry-pick release-v0.9.x

tekton-robot commented 5 months ago

@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".
In response to [this](https://github.com/tektoncd/results/pull/746#issuecomment-2045086789): >/cherry-pick release-v0.9.x Instructions for interacting with me using PR comments are available [here](https://git.k8s.io/community/contributors/guide/pull-requests.md). If you have questions or suggestions related to my behavior, please file an issue against the [kubernetes/test-infra](https://github.com/kubernetes/test-infra/issues/new?title=Prow%20issue:) repository.