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

Backport of [NET-5146] security: Upgrade Go and x/net into release/1.2.x #2714

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #2710 to be assessed for backporting due to the inclusion of the label backport/1.2.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@zalimeni
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Upgrade to Go 1.20.7 and x/net 1.13.0 to resolve CVE-2023-29409 and CVE-2023-3978.

How I've tested this PR: tests continue to pass

How I expect reviewers to test this PR: 👀

Checklist:


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/zalimeni/net-5146-bump-go-net_http-cve/moderately-advanced-cockatoo branch 2 times, most recently from 0cd9d89 to dd7449c Compare August 2, 2023 17:05
@hashicorp-cla
Copy link

hashicorp-cla commented Aug 2, 2023

CLA assistant check
All committers have signed the CLA.

@zalimeni zalimeni force-pushed the backport/zalimeni/net-5146-bump-go-net_http-cve/moderately-advanced-cockatoo branch from ace5d83 to b6c5b61 Compare August 3, 2023 13:45
@zalimeni zalimeni marked this pull request as ready for review August 3, 2023 13:45
@zalimeni zalimeni enabled auto-merge (squash) August 3, 2023 13:49
@zalimeni zalimeni disabled auto-merge August 3, 2023 14:05
@zalimeni zalimeni merged commit 9d29f36 into release/1.2.x Aug 3, 2023
@zalimeni zalimeni deleted the backport/zalimeni/net-5146-bump-go-net_http-cve/moderately-advanced-cockatoo branch August 3, 2023 16:38
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

Successfully merging this pull request may close these issues.

3 participants