Skip to content

Post release 1.21.0 rc2#22317

Merged
nitin-sachdev-29 merged 9 commits into
release/1.21.xfrom
post-release-1.21.0-rc2
May 5, 2025
Merged

Post release 1.21.0 rc2#22317
nitin-sachdev-29 merged 9 commits into
release/1.21.xfrom
post-release-1.21.0-rc2

Conversation

@nitin-sachdev-29
Copy link
Copy Markdown
Contributor

Description

Post release 1.21.0 rc2

Testing & Reproduction steps

Links

PR Checklist

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

nitin-sachdev-29 and others added 8 commits April 17, 2025 08:24
* 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)
* prepping for 1.21.0-rc2 release

* fixed VERSION
* 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>
…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>
# Conflicts:
#	test-integ/go.mod
#	test/integration/consul-container/go.sum
@nitin-sachdev-29 nitin-sachdev-29 self-assigned this May 5, 2025
@nitin-sachdev-29 nitin-sachdev-29 added the pr/no-changelog PR does not need a corresponding .changelog entry label May 5, 2025
@nitin-sachdev-29 nitin-sachdev-29 requested a review from a team as a code owner May 5, 2025 17:59
@nitin-sachdev-29 nitin-sachdev-29 requested a review from a team as a code owner May 5, 2025 18:11
@nitin-sachdev-29 nitin-sachdev-29 requested a review from shore May 5, 2025 18:11
@nitin-sachdev-29 nitin-sachdev-29 enabled auto-merge (squash) May 5, 2025 18:31
@nitin-sachdev-29 nitin-sachdev-29 merged commit a395865 into release/1.21.x May 5, 2025
92 checks passed
@nitin-sachdev-29 nitin-sachdev-29 deleted the post-release-1.21.0-rc2 branch May 5, 2025 18:49
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport pr/no-changelog PR does not need a corresponding .changelog entry

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants