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

🐛 deps: bump golang.org/x/net to 0.17.0 #2540

Merged
merged 1 commit into from
Oct 12, 2023
Merged

🐛 deps: bump golang.org/x/net to 0.17.0 #2540

merged 1 commit into from
Oct 12, 2023

Conversation

joelanford
Copy link
Member

@joelanford joelanford commented Oct 12, 2023 •
edited
Loading

Fixes a vulnerability related to https://www.cisa.gov/news-events/alerts/2023/10/10/http2-rapid-reset-vulnerability-cve-2023-44487

(Note: there are further required fixed for this CVE that will come in a follow-up PR once kubernetes/kubernetes#121120 merges)

@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Oct 12, 2023
@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 12, 2023
@joelanford
Copy link
Member Author

/hold

Potentially some other changes from k8s.io repos are needed as well.

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 12, 2023
@joelanford
deps: bump golang.org/x/net to 0.17.0
949a418 
Signed-off-by: Joe Lanford <joe.lanford@gmail.com>
@k8s-ci-robot k8s-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Oct 12, 2023
@joelanford
Copy link
Member Author

/hold cancel

I'll make a follow-up PR for the k8s bumps.

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 12, 2023
@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 12, 2023
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: joelanford, vincepri

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 [joelanford,vincepri]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@k8s-ci-robot k8s-ci-robot merged commit e25aeeb into kubernetes-sigs:main Oct 12, 2023
@k8s-infra-cherrypick-robot
Copy link

@joelanford: #2540 failed to apply on top of branch "release-0.16":

Applying: deps: bump golang.org/x/net to 0.17.0
Using index info to reconstruct a base tree...
M	examples/scratch-env/go.sum
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging examples/scratch-env/go.sum
CONFLICT (content): Merge conflict in examples/scratch-env/go.sum
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 deps: bump golang.org/x/net to 0.17.0
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:

Cherry picking back to match where kubernetes backported (k8s 1.25)

/cherry-pick release-0.16
/cherry-pick release-0.15
/cherry-pick release-0.14
/cherry-pick release-0.13

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.

@joelanford
Copy link
Member Author

Cherry picking back to match where kubernetes backported (k8s 1.25)

/cherrypick release-0.16
/cherrypick release-0.15
/cherrypick release-0.14
/cherrypick release-0.13

@k8s-infra-cherrypick-robot
Copy link

@joelanford: #2540 failed to apply on top of branch "release-0.16":

Applying: deps: bump golang.org/x/net to 0.17.0
Using index info to reconstruct a base tree...
M	examples/scratch-env/go.sum
M	go.mod
M	go.sum
Falling back to patching base and 3-way merge...
Auto-merging go.sum
CONFLICT (content): Merge conflict in go.sum
Auto-merging go.mod
CONFLICT (content): Merge conflict in go.mod
Auto-merging examples/scratch-env/go.sum
CONFLICT (content): Merge conflict in examples/scratch-env/go.sum
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 deps: bump golang.org/x/net to 0.17.0
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:

Cherry picking back to match where kubernetes backported (k8s 1.25)

/cherrypick release-0.16
/cherrypick release-0.15
/cherrypick release-0.14
/cherrypick release-0.13

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 Oct 13, 2023
Merged
Merged
Merged
Merged
mansikulkarni96 added a commit to mansikulkarni96/windows-machine-config-operator that referenced this pull request Oct 16, 2023
@mansikulkarni96
[vendor] Update controller-runtime for golang: net/http
a653167 
go get -u sigs.k8s.io/controller-runtime
to pick up the fix introduced in controller-runtime
kubernetes-sigs/controller-runtime#2540
mansikulkarni96 added a commit to mansikulkarni96/windows-machine-config-operator that referenced this pull request Oct 16, 2023
@mansikulkarni96
[vendor] Update controller-runtime for golang: net/http
1d439ba 
go get -u sigs.k8s.io/controller-runtime
to pick up the fix introduced in controller-runtime
kubernetes-sigs/controller-runtime#2540
mansikulkarni96 added a commit to mansikulkarni96/windows-machine-config-operator that referenced this pull request Oct 16, 2023
@mansikulkarni96
[vendor] Update controller-runtime for golang: net/http
b0d1a73 
go get -u sigs.k8s.io/controller-runtime
to pick up the fix introduced in controller-runtime
kubernetes-sigs/controller-runtime#2540
mansikulkarni96 added a commit to mansikulkarni96/windows-machine-config-operator that referenced this pull request Oct 16, 2023
@mansikulkarni96
[vendor] Update controller-runtime for golang: net/http
edae301 
go get -u sigs.k8s.io/controller-runtime
to pick up the fix introduced in controller-runtime
kubernetes-sigs/controller-runtime#2540
mansikulkarni96 added a commit to mansikulkarni96/windows-machine-config-operator that referenced this pull request Oct 17, 2023
@mansikulkarni96
[vendor] Update controller-runtime for golang: net/http
f0d4b5a 
go get -u sigs.k8s.io/controller-runtime
to pick up the fix introduced in controller-runtime
kubernetes-sigs/controller-runtime#2540
go get -u k8s.io/apimachinery@release-1.28
@kcp-ci-bot kcp-ci-bot mentioned this pull request Feb 29, 2024
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@vincepri vincepri vincepri approved these changes

@FillZpp FillZpp Awaiting requested review from FillZpp

@varshaprasad96 varshaprasad96 Awaiting requested review from varshaprasad96

Assignees

@vincepri vincepri

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@joelanford @k8s-ci-robot @k8s-infra-cherrypick-robot @vincepri