Skip to content

Commit e413d20

Browse files
authored
[release 2.17] Upgrade go to 1.25.4 (#13697)
#### What this PR does Upgrade go to 1.25.4 for release 2.17. #### Which issue(s) this PR fixes or relates to N/A #### Checklist - [ ] Tests updated. - [ ] Documentation added. - [x] `CHANGELOG.md` updated - the order of entries should be `[CHANGE]`, `[FEATURE]`, `[ENHANCEMENT]`, `[BUGFIX]`. If changelog entry is not needed, please add the `changelog-not-needed` label to the PR. - [ ] [`about-versioning.md`](https://github.com/grafana/mimir/blob/main/docs/sources/mimir/configure/about-versioning.md) updated with experimental features. <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Upgrades Go to 1.25.4 across the repo, updates the build image and golangci-lint, refreshes CI workflow and changelog, and fixes a minor test comment typo. > > - **Build/Toolchain**: > - Bump Go to `1.25.4` in `go.mod`, CI workflow (`.github/workflows/update-vendored-mimir-prometheus.yml`), and `mimir-build-image/Dockerfile`. > - Update build image tag in `Makefile`; switch base image and bump `golangci-lint` to `v2.4.0`. > - **Docs/Changelog**: > - Update `CHANGELOG.md` for 2.17.3 to reference Go `1.25.4` and related CVEs. > - **Tests**: > - Fix typo in a comment in `pkg/alertmanager/multitenant_test.go`. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 199dbd9. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY -->
1 parent 633f84d commit e413d20

6 files changed

Lines changed: 7 additions & 7 deletions

File tree

.github/workflows/update-vendored-mimir-prometheus.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ jobs:
7272
uses: actions/setup-go@v5
7373
with:
7474
# We only use this to run `go mod` commands, so it doesn't need to follow the version used in the Dockerfile.
75-
go-version: "1.24.9"
75+
go-version: "1.25.4"
7676

7777
# This job uses "mimir-vendoring bot" instead of "github-actions bot" (secrets.GITHUB_TOKEN)
7878
# because any events triggered by the later don't spawn GitHub actions.

CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
### Grafana Mimir
66

7-
* [BUGFIX] Update to Go v1.24.9 to address [CVE-2025-61725](https://www.cve.org/CVERecord?id=CVE-2025-61725), [CVE-2025-58188](https://www.cve.org/CVERecord?id=CVE-2025-58188). #13353
7+
* [BUGFIX] Update to Go v1.25.4 to address [CVE-2025-61725](https://www.cve.org/CVERecord?id=CVE-2025-61725), [CVE-2025-58188](https://www.cve.org/CVERecord?id=CVE-2025-58188). #13697
88

99
## 2.17.2
1010

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ mimir-build-image/$(UPTODATE): mimir-build-image/*
247247
# All the boiler plate for building golang follows:
248248
SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
249249
BUILD_IN_CONTAINER ?= true
250-
LATEST_BUILD_IMAGE_TAG ?= pr13353-8dffd219e0
250+
LATEST_BUILD_IMAGE_TAG ?= pr13697-384a29ec81
251251

252252
# TTY is parameterized to allow CI and scripts to run builds,
253253
# as it currently disallows TTY devices.

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/grafana/mimir
22

3-
go 1.24.2
3+
go 1.25.4
44

55
require (
66
github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.6.1

mimir-build-image/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
FROM registry.k8s.io/kustomize/kustomize:v5.4.3 AS kustomize
77
FROM alpine/helm:3.17.2 AS helm
8-
FROM golang:1.24.9-bookworm
8+
FROM golang:1.25.4-trixie@sha256:a02d35efc036053fdf0da8c15919276bf777a80cbfda6a35c5e9f087e652adfc
99
ARG goproxyValue
1010
ENV GOPROXY=${goproxyValue}
1111
ENV SKOPEO_DEPS="libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config"
@@ -39,7 +39,7 @@ RUN GOARCH=$(go env GOARCH) && \
3939
curl -fSL -o "/usr/bin/tk" "https://github.com/grafana/tanka/releases/download/v${TANKA_VERSION}/tk-linux-${GOARCH}" && \
4040
chmod a+x /usr/bin/tk
4141

42-
RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v2.0.2
42+
RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh| sh -s -- -b /usr/bin v2.4.0
4343

4444
ENV SKOPEO_VERSION=v1.15.1
4545
RUN git clone --depth 1 --branch ${SKOPEO_VERSION} https://github.com/containers/skopeo /go/src/github.com/containers/skopeo && \

pkg/alertmanager/multitenant_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2527,7 +2527,7 @@ receivers:
25272527
}
25282528

25292529
func TestMultitenantAlertmanager_computeFallbackConfig(t *testing.T) {
2530-
// If no fallback configration is set, it returns a valid empty configuration.
2530+
// If no fallback configuration is set, it returns a valid empty configuration.
25312531
fallbackConfig, err := ComputeFallbackConfig("")
25322532
require.NoError(t, err)
25332533

0 commit comments

Comments
 (0)