Backport of CVE Fix into release/1.21.0-rc2#22271
Merged
nitin-sachdev-29 merged 2 commits intorelease/1.21.0-rc2from Apr 17, 2025
Merged
Backport of CVE Fix into release/1.21.0-rc2#22271nitin-sachdev-29 merged 2 commits intorelease/1.21.0-rc2from
nitin-sachdev-29 merged 2 commits intorelease/1.21.0-rc2from
Conversation
* 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)
nitin-sachdev-29
added
pr/no-changelog
github-actions
bot
added
theme/api
nitin-sachdev-29
merged commit c115e8d
into
release/1.21.0-rc2
126 of 174 checks passed
nitin-sachdev-29
deleted the
backport/nitin/cve-fix/evidently-organic-ostrich
branch
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>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
Backport of CVE Fix into release/1.21.0-rc2
Testing & Reproduction steps
Links
PR Checklist