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-5944] security: Update Go version to 1.20.10 and x/net to 0.17.0 into release/1.14.x #19232

Conversation

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

Backport

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

🚨

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/merges: 409 Merge conflict []

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


Description

  • Upgrade Go to 1.20.10
  • Update x/net to 1.17.0 (latest)

Change will be backported to all (1.14.x-1.17.x) release branches with future releases scheduled. This will likely also be a manual backport to 1.17.0 GA depending on branch cut timing.

Testing & Reproduction steps

CI tests should continue to pass.

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

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/honestly-organic-ibex branch 2 times, most recently from 4d671e8 to 3a9f703 Compare October 16, 2023 21:49
@hashicorp-cla
Copy link

hashicorp-cla commented Oct 16, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul October 16, 2023 21:54 Inactive
@zalimeni zalimeni force-pushed the backport/zalimeni/net-5944-go-update-1.20.10/honestly-organic-ibex branch from c3dae3e to 50f107d Compare October 17, 2023 00:06
@zalimeni zalimeni marked this pull request as ready for review October 17, 2023 00:07
@zalimeni zalimeni requested a review from a team as a code owner October 17, 2023 00:07
@zalimeni zalimeni requested a review from a team October 17, 2023 00:07
@zalimeni zalimeni requested a review from a team as a code owner October 17, 2023 00:07
@zalimeni zalimeni requested review from dekimsey and claire-labry and removed request for a team October 17, 2023 00:07
@zalimeni zalimeni merged commit ae50660 into release/1.14.x Oct 17, 2023
85 checks passed
@zalimeni zalimeni deleted the backport/zalimeni/net-5944-go-update-1.20.10/honestly-organic-ibex branch October 17, 2023 00:47
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.

4 participants