Skip to content

Commit 0b9f8b4

Browse files
zenadorpracucci
andauthored
release-3.0 backport PR #13755 to address CVE-2025-61729, CVE-2025-61727 (#13909)
#### What this PR does Update to Go v1.25.5 to address CVE-2025-61729, CVE-2025-61727. #### 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] > **Build/tooling upgrade** > > - Bumps Go to `1.25.5` in `go.mod`, GitHub Actions workflow (`setup-go`), and `mimir-build-image/Dockerfile` (new base image digest) > - Updates Makefile `LATEST_BUILD_IMAGE_TAG` to `pr13909-f969d53533` > - Adds `CHANGELOG.md` entry noting the security update to Go 1.25.5 > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit 612fcf0. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Signed-off-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: Marco Pracucci <marco@pracucci.com> Co-authored-by: pracucci <pracucci@users.noreply.github.com>
1 parent ded396d commit 0b9f8b4

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

.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.25.1"
75+
go-version: "1.25.5"
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: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## main / unreleased
44

5+
### Grafana Mimir
6+
7+
* [BUGFIX] Update to Go v1.25.5 to address [CVE-2025-61729](https://pkg.go.dev/vuln/GO-2025-4155). #13909
8+
59
## 3.0.1
610

711
### Grafana Mimir

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ mimir-build-image/$(UPTODATE): mimir-build-image/*
225225
# All the boiler plate for building golang follows:
226226
SUDO := $(shell docker info >/dev/null 2>&1 || echo "sudo -E")
227227
BUILD_IN_CONTAINER ?= true
228-
LATEST_BUILD_IMAGE_TAG ?= pr13692-ed0e12ca15
228+
LATEST_BUILD_IMAGE_TAG ?= pr13909-f969d53533
229229

230230
# TTY is parameterized to allow CI and scripts to run builds,
231231
# 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.25.4
3+
go 1.25.5
44

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

mimir-build-image/Dockerfile

Lines changed: 1 addition & 1 deletion
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.25.4-trixie@sha256:a02d35efc036053fdf0da8c15919276bf777a80cbfda6a35c5e9f087e652adfc
8+
FROM golang:1.25.5-trixie@sha256:4f9d98ebaa759f776496d850e0439c48948d587b191fc3949b5f5e4667abef90
99
ARG goproxyValue
1010
ENV GOPROXY=${goproxyValue}
1111
ENV SKOPEO_DEPS="libgpgme-dev libassuan-dev libbtrfs-dev libdevmapper-dev pkg-config"

0 commit comments

Comments
 (0)