From 83ed01170fea45d6066898120834232ed2c22ff8 Mon Sep 17 00:00:00 2001 From: dongjiang Date: Tue, 25 Nov 2025 04:35:15 +0800 Subject: [PATCH] Merge pull request #8062 from kubeservice-stack/update-thanos-v0.40.1 chore: Update thanos version to v0.40.1 and golang version to 1.25 --- .github/env | 2 +- .golangci-kal.yml | 2 +- .golangci.yml | 2 +- Dockerfile | 2 +- Documentation/getting-started/compatibility.md | 2 +- cmd/admission-webhook/Dockerfile | 2 +- cmd/prometheus-config-reloader/Dockerfile | 2 +- go.mod | 6 ++---- go.sum | 6 +++--- pkg/operator/defaults.go | 2 +- 10 files changed, 13 insertions(+), 15 deletions(-) diff --git a/.github/env b/.github/env index 9639cc32d..4357c7048 100644 --- a/.github/env +++ b/.github/env @@ -1,4 +1,4 @@ -golang-version=1.24 +golang-version=1.25 kind-version=v0.30.0 kind-image=kindest/node:v1.34.0 golangci-lint-version=v2.6.1 diff --git a/.golangci-kal.yml b/.golangci-kal.yml index b3bac2df1..ed781793a 100644 --- a/.golangci-kal.yml +++ b/.golangci-kal.yml @@ -6,7 +6,7 @@ # https://github.com/kubernetes-sigs/kube-api-linter/blob/main/docs/linters.md version: "2" run: - go: "1.24" + go: "1.25" allow-parallel-runners: true linters: default: none diff --git a/.golangci.yml b/.golangci.yml index 6a6de721d..e16023ad5 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -1,6 +1,6 @@ version: "2" run: - go: "1.24" + go: "1.25" timeout: 10m modules-download-mode: readonly allow-parallel-runners: true diff --git a/Dockerfile b/Dockerfile index 6031fcf36..ee43ddfa4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ ARG ARCH=amd64 ARG OS=linux -ARG GOLANG_BUILDER=1.24 +ARG GOLANG_BUILDER=1.25 FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder WORKDIR /workspace diff --git a/Documentation/getting-started/compatibility.md b/Documentation/getting-started/compatibility.md index f534f927c..332e8df5e 100644 --- a/Documentation/getting-started/compatibility.md +++ b/Documentation/getting-started/compatibility.md @@ -94,5 +94,5 @@ The Prometheus Operator is compatible with Thanos v0.10 and above. The end-to-end tests are mostly tested against ```$ mdox-exec="go run ./cmd/po-docgen/. compatibility defaultThanosVersion" -* v0.39.2 +* v0.40.1 ``` diff --git a/cmd/admission-webhook/Dockerfile b/cmd/admission-webhook/Dockerfile index 7fd8f8743..71cd4ab15 100644 --- a/cmd/admission-webhook/Dockerfile +++ b/cmd/admission-webhook/Dockerfile @@ -1,6 +1,6 @@ ARG ARCH=amd64 ARG OS=linux -ARG GOLANG_BUILDER=1.24 +ARG GOLANG_BUILDER=1.25 FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder WORKDIR /workspace diff --git a/cmd/prometheus-config-reloader/Dockerfile b/cmd/prometheus-config-reloader/Dockerfile index d84cfb965..74ed0f0bd 100644 --- a/cmd/prometheus-config-reloader/Dockerfile +++ b/cmd/prometheus-config-reloader/Dockerfile @@ -1,6 +1,6 @@ ARG ARCH=amd64 ARG OS=linux -ARG GOLANG_BUILDER=1.24 +ARG GOLANG_BUILDER=1.25 FROM quay.io/prometheus/golang-builder:${GOLANG_BUILDER}-base AS builder WORKDIR /workspace diff --git a/go.mod b/go.mod index d1c64cfce..f2e477bc6 100644 --- a/go.mod +++ b/go.mod @@ -1,8 +1,6 @@ module github.com/prometheus-operator/prometheus-operator -go 1.24.0 - -toolchain go1.24.3 +go 1.25.0 require ( github.com/KimMachineGun/automemlimit v0.7.5 @@ -30,7 +28,7 @@ require ( // Since we needed the change added in https://github.com/prometheus/prometheus/pull/16928 and it's not released yet. github.com/prometheus/prometheus v0.307.3 github.com/stretchr/testify v1.11.1 - github.com/thanos-io/thanos v0.39.2 + github.com/thanos-io/thanos v0.40.1 go.uber.org/automaxprocs v1.6.0 golang.org/x/net v0.47.0 golang.org/x/sync v0.18.0 diff --git a/go.sum b/go.sum index 80b409b88..14700ba43 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,4 @@ -cloud.google.com/go v0.118.0 h1:tvZe1mgqRxpiVa3XlIGMiPcEUbP1gNXELgD4y/IXmeQ= +cloud.google.com/go v0.120.0 h1:wc6bgG9DHyKqF5/vQvX1CiZrtHnxJjBlKUyF9nP6meA= cloud.google.com/go/auth v0.16.5 h1:mFWNQ2FEVWAliEQWpAdH80omXFokmrnbDhUS9cBywsI= cloud.google.com/go/auth v0.16.5/go.mod h1:utzRfHMP+Vv0mpOkTRQoWD2q3BatTOoWbA7gCc2dUhQ= cloud.google.com/go/auth/oauth2adapt v0.2.8 h1:keo8NaayQZ6wimpNSmW5OPc283g65QNIiLpZnkHRbnc= @@ -329,8 +329,8 @@ github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXl github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U= github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U= -github.com/thanos-io/thanos v0.39.2 h1:edN03y7giEc6lD17HJhYcv8ELapXxElmhJnFIYJ2GqQ= -github.com/thanos-io/thanos v0.39.2/go.mod h1:bvUPJNIx2LBXme6yBinRiGqQinxlGikLlK7PGeFQPkQ= +github.com/thanos-io/thanos v0.40.1 h1:osjcmfQTXGoFeXTVLR56+RQo7bdtQmsNem73rflYwb0= +github.com/thanos-io/thanos v0.40.1/go.mod h1:TI/hLlnHK5XuHsycq5jNiQ9VrtjjejbG3lG2U3JJr1Y= github.com/x448/float16 v0.8.4 h1:qLwI1I70+NjRFUR3zs1JPUCgaCXSh3SW62uAKT1mSBM= github.com/x448/float16 v0.8.4/go.mod h1:14CWIYCyZA/cWjXOioeEpHeN/83MdbZDRQHoFcYsOfg= github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= diff --git a/pkg/operator/defaults.go b/pkg/operator/defaults.go index fe6026278..52692734a 100644 --- a/pkg/operator/defaults.go +++ b/pkg/operator/defaults.go @@ -29,7 +29,7 @@ const ( DefaultAlertmanagerImage = DefaultAlertmanagerBaseImage + ":" + DefaultAlertmanagerVersion // DefaultThanosVersion is a default image tag for the Thanos long-term prometheus storage collector. - DefaultThanosVersion = "v0.39.2" + DefaultThanosVersion = "v0.40.1" // DefaultThanosBaseImage is a base container registry address for the Thanos long-term prometheus // storage collector. DefaultThanosBaseImage = "quay.io/thanos/thanos"