Skip to content

Backport of [NET-4865] Bump golang.org/x/net to 0.12.0 in cni into release/1.1.x#2692

Merged
zalimeni merged 2 commits intorelease/1.1.xfrom
backport/zalimeni/net-4865-bump-go-net_http-cve-cni/virtually-unified-snipe
Jul 28, 2023
Merged

Backport of [NET-4865] Bump golang.org/x/net to 0.12.0 in cni into release/1.1.x#2692
zalimeni merged 2 commits intorelease/1.1.xfrom
backport/zalimeni/net-4865-bump-go-net_http-cve-cni/virtually-unified-snipe

Conversation

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

Backport

This PR is auto-generated from #2668 to be assessed for backporting due to the inclusion of the label backport/1.1.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.


This was missed in 5b57e63 as part of a general upgrade of that dependency.

Also take the opportunity to bump server-connection-manager, which is a transitive deps no-op but doesn't hurt to bring to latest now that we've released it for the same series of CVE upgrades.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/zalimeni/net-4865-bump-go-net_http-cve-cni/virtually-unified-snipe branch 2 times, most recently from 95a52e6 to 7c63ebe Compare July 28, 2023 20:37
@zalimeni zalimeni marked this pull request as ready for review July 28, 2023 20:48
@zalimeni zalimeni force-pushed the backport/zalimeni/net-4865-bump-go-net_http-cve-cni/virtually-unified-snipe branch from 22c29c5 to e4c95d1 Compare July 28, 2023 20:49
@zalimeni zalimeni enabled auto-merge (squash) July 28, 2023 20:49
@zalimeni zalimeni disabled auto-merge July 28, 2023 20:56
@zalimeni zalimeni force-pushed the backport/zalimeni/net-4865-bump-go-net_http-cve-cni/virtually-unified-snipe branch from e4c95d1 to 82b13dd Compare July 28, 2023 21:03
@zalimeni zalimeni enabled auto-merge (squash) July 28, 2023 21:05
@zalimeni zalimeni merged commit 999c617 into release/1.1.x Jul 28, 2023
@zalimeni zalimeni deleted the backport/zalimeni/net-4865-bump-go-net_http-cve-cni/virtually-unified-snipe branch July 28, 2023 21:25
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.

2 participants