From 9de63aefe16c135cc1f1e167982baffde8142979 Mon Sep 17 00:00:00 2001 From: Daniel Sabsay Date: Tue, 16 Dec 2025 12:55:01 -0800 Subject: [PATCH 1/4] update to go1.25 Signed-off-by: Daniel Sabsay --- build-image/Dockerfile | 2 +- go.mod | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index 2aa5ae80cc2..dc000421715 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.24.6-bullseye +FROM golang:1.25.5-bullseye ARG goproxyValue ENV GOPROXY=${goproxyValue} RUN apt-get update && apt-get install -y curl file gettext jq unzip protobuf-compiler libprotobuf-dev && \ diff --git a/go.mod b/go.mod index a5f5e66dee1..9aaf76dfe41 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cortexproject/cortex -go 1.24.0 +go 1.25.5 require ( github.com/Masterminds/squirrel v1.5.4 From 83564240b886c5c8c727b3c2838b73566c5f1ef8 Mon Sep 17 00:00:00 2001 From: Daniel Sabsay Date: Tue, 16 Dec 2025 12:59:34 -0800 Subject: [PATCH 2/4] update changelog Signed-off-by: Daniel Sabsay --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ad6054e5be..5400f3aaa6d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -17,6 +17,7 @@ * [ENHANCEMENT] Compactor: Avoid double compaction by cleaning partition files in 2 cycles. #7129 * [ENHANCEMENT] Distributor: Optimize memory usage by recycling v2 requests. #7131 * [ENHANCEMENT] Compactor: Avoid double compaction by not filtering delete blocks on real time when using bucketIndex lister. #7156 +* [ENHANCEMENT] Upgrade to go 1.25. #7164 * [BUGFIX] Ring: Change DynamoDB KV to retry indefinitely for WatchKey. #7088 * [BUGFIX] Ruler: Add XFunctions validation support. #7111 * [BUGFIX] Querier: propagate Prometheus info annotations in protobuf responses. #7132 From 67602c8c815154d76a2dea01ccbaf8ee4428ba95 Mon Sep 17 00:00:00 2001 From: Daniel Sabsay Date: Tue, 16 Dec 2025 13:23:57 -0800 Subject: [PATCH 3/4] fix build image tag Signed-off-by: Daniel Sabsay --- build-image/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build-image/Dockerfile b/build-image/Dockerfile index dc000421715..43ad7991fe9 100644 --- a/build-image/Dockerfile +++ b/build-image/Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.25.5-bullseye +FROM golang:1.25.5-trixie ARG goproxyValue ENV GOPROXY=${goproxyValue} RUN apt-get update && apt-get install -y curl file gettext jq unzip protobuf-compiler libprotobuf-dev && \ From 945119a4b76907e10ed7743a3208ac33ea80333d Mon Sep 17 00:00:00 2001 From: Daniel Sabsay Date: Tue, 16 Dec 2025 13:30:09 -0800 Subject: [PATCH 4/4] revert go directive to 1.24 Signed-off-by: Daniel Sabsay --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 9aaf76dfe41..a5f5e66dee1 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/cortexproject/cortex -go 1.25.5 +go 1.24.0 require ( github.com/Masterminds/squirrel v1.5.4