Skip to content

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

Merged
zalimeni merged 1 commit intorelease/1.2.xfrom
backport/zalimeni/net-5944-go-update-1.20.10/solely-joint-tiger
Oct 17, 2023
Merged

Backport of [NET-5944] security: Upgrade Go and x/net into release/1.2.x#3088
zalimeni merged 1 commit intorelease/1.2.xfrom
backport/zalimeni/net-5944-go-update-1.20.10/solely-joint-tiger

Conversation

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

Backport

This PR is auto-generated from #3085 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.10 and x/net 1.17.0 to resolve CVE-2023-39325
/ CVE-2023-44487.

See hashicorp/consul#19225 for detailed links.

Change will be backported to all (1.0.x-1.2.x) release branches with future releases scheduled. This will likely also be a manual backport to 1.3.0 GA and 1.3.x depending on branch cut timing.

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-5944-go-update-1.20.10/solely-joint-tiger branch from 254b3ce to f8a2341 Compare October 16, 2023 21:56
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Oct 16, 2023

CLA assistant check
All committers have signed the CLA.

@zalimeni zalimeni force-pushed the backport/zalimeni/net-5944-go-update-1.20.10/solely-joint-tiger branch from 17856da to dc4d289 Compare October 17, 2023 00:11
@zalimeni zalimeni marked this pull request as ready for review October 17, 2023 00:11
@zalimeni zalimeni enabled auto-merge (squash) October 17, 2023 00:12
@zalimeni zalimeni merged commit 748b120 into release/1.2.x Oct 17, 2023
@zalimeni zalimeni deleted the backport/zalimeni/net-5944-go-update-1.20.10/solely-joint-tiger branch October 17, 2023 00:39
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