Skip to content

Conversation

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

Backport

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

🚨

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:
@nitin-sachdev-29
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: unable to process merge commit: "2c8b4744b93f97e5e29946e1e869eae65f048cd1", automatic backport requires rebase workflow

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


Description

Upgraded go to 1.23.8

Testing & Reproduction steps

Links

PR Checklist

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

Overview of commits

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

@github-actions github-actions bot added theme/api Relating to the HTTP API interface pr/dependencies PR specifically updates dependencies of project labels Apr 17, 2025
@nitin-sachdev-29 nitin-sachdev-29 marked this pull request as ready for review April 17, 2025 10:36
@nitin-sachdev-29 nitin-sachdev-29 requested a review from a team as a code owner April 17, 2025 10:36
Copy link
Contributor

@nitin-sachdev-29 nitin-sachdev-29 left a comment

Choose a reason for hiding this comment

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

LGTM

@nitin-sachdev-29 nitin-sachdev-29 enabled auto-merge (squash) April 17, 2025 10:51
@nitin-sachdev-29 nitin-sachdev-29 merged commit b801207 into release/1.21.x Apr 17, 2025
184 of 193 checks passed
@nitin-sachdev-29 nitin-sachdev-29 deleted the backport/nitin/cve-fix/remotely-electric-dingo branch April 17, 2025 10:58
nitin-sachdev-29 added a commit that referenced this pull request Apr 18, 2025
…se/1.21.x (#22281)

* Backport of CVE Fix into release/1.21.x (#22269)

* backport of commit 73c592c

* CVE Fix (#22268)

* Fixed following CVEs:
GHSA-vvgc-356p-c3xw in golang.org/x/net@v0.37.0
GO-2025-3595 in golang.org/x/net@v0.37.0
GO-2025-3553 in github.com/golang-jwt/jwt/v4@v4.5.1
GHSA-mh63-6h87-95cp in github.com/golang-jwt/jwt/v4@v4.5.1
stdlib in Go GO-2025-3563@1.23.7

* added changelog

(cherry picked from commit 519fb0a)

---------

Co-authored-by: nitin.sachdev <nitin.sachdev@hashicorp.com>

* Backport of Upgraded go to 1.23.8 into release/1.21.x (#22274)

* backport of commit cedded6

* backport of commit dd4f628

---------

Co-authored-by: nitin.sachdev <nitin.sachdev@hashicorp.com>

* backport of commit 5d7f3ee

---------

Co-authored-by: hc-github-team-consul-core <github-team-consul-core@hashicorp.com>
nitin-sachdev-29 added a commit that referenced this pull request May 5, 2025
* prepping for 1.21.0-rc2 release (#22267)

* Backport of CVE Fix into release/1.21.0-rc2 (#22271)

* backport of commit 73c592c

* CVE Fix (#22268)

* Fixed following CVEs:
GHSA-vvgc-356p-c3xw in golang.org/x/net@v0.37.0
GO-2025-3595 in golang.org/x/net@v0.37.0
GO-2025-3553 in github.com/golang-jwt/jwt/v4@v4.5.1
GHSA-mh63-6h87-95cp in github.com/golang-jwt/jwt/v4@v4.5.1
stdlib in Go GO-2025-3563@1.23.7

* added changelog

(cherry picked from commit 519fb0a)

* Prep release 1.21.0 rc2 (#22272)

* prepping for 1.21.0-rc2 release

* fixed VERSION

* Backport of Upgraded go to 1.23.8 into release/1.21.0-rc2 (#22276)

* Backport of CVE Fix into release/1.21.x (#22269)

* backport of commit 73c592c

* CVE Fix (#22268)

* Fixed following CVEs:
GHSA-vvgc-356p-c3xw in golang.org/x/net@v0.37.0
GO-2025-3595 in golang.org/x/net@v0.37.0
GO-2025-3553 in github.com/golang-jwt/jwt/v4@v4.5.1
GHSA-mh63-6h87-95cp in github.com/golang-jwt/jwt/v4@v4.5.1
stdlib in Go GO-2025-3563@1.23.7

* added changelog

(cherry picked from commit 519fb0a)

---------

Co-authored-by: nitin.sachdev <nitin.sachdev@hashicorp.com>

* backport of commit cedded6

* backport of commit dd4f628

---------

Co-authored-by: hc-github-team-consul-core <github-team-consul-core@hashicorp.com>

* Backport of suppressing alpine CVEs as there is no fix yet into release/1.21.x (#22281)

* Backport of CVE Fix into release/1.21.x (#22269)

* backport of commit 73c592c

* CVE Fix (#22268)

* Fixed following CVEs:
GHSA-vvgc-356p-c3xw in golang.org/x/net@v0.37.0
GO-2025-3595 in golang.org/x/net@v0.37.0
GO-2025-3553 in github.com/golang-jwt/jwt/v4@v4.5.1
GHSA-mh63-6h87-95cp in github.com/golang-jwt/jwt/v4@v4.5.1
stdlib in Go GO-2025-3563@1.23.7

* added changelog

(cherry picked from commit 519fb0a)

---------

Co-authored-by: nitin.sachdev <nitin.sachdev@hashicorp.com>

* Backport of Upgraded go to 1.23.8 into release/1.21.x (#22274)

* backport of commit cedded6

* backport of commit dd4f628

---------

Co-authored-by: nitin.sachdev <nitin.sachdev@hashicorp.com>

* backport of commit 5d7f3ee

---------

Co-authored-by: hc-github-team-consul-core <github-team-consul-core@hashicorp.com>

* post release 1.21.0-rc2

* executed go mod tidy

* Remove s390x build configuration from CI workflows

---------

Co-authored-by: hc-github-team-consul-core <github-team-consul-core@hashicorp.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
pr/dependencies PR specifically updates dependencies of project theme/api Relating to the HTTP API interface
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants