coreos/prometheus-operator
1
0
Fork 0
mirror of https://github.com/coreos/prometheus-operator.git synced 2026-02-05 06:45:27 +01:00
Code Issues Releases Wiki Activity

Merge pull request #8062 from kubeservice-stack/update-thanos-v0.40.1

Browse Source 
chore: Update thanos version to v0.40.1 and golang version to 1.25
This commit is contained in:
dongjiang
2025-11-25 04:35:15 +08:00
committed by GitHub
parent c31716ba07
commit 83ed01170f
10 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/env vendored
View File

@@ -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

2
.golangci-kal.yml
View File

@@ -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

2
.golangci.yml
View File

@@ -1,6 +1,6 @@
version: "2"
run:
go: "1.24"
go: "1.25"
timeout: 10m
modules-download-mode: readonly
allow-parallel-runners: true

2
Dockerfile
View File

@@ -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

2
Documentation/getting-started/compatibility.md
View File

@@ -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
```

2
cmd/admission-webhook/Dockerfile
View File

@@ -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

2
cmd/prometheus-config-reloader/Dockerfile
View File

@@ -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

6
go.mod
View File

@@ -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

6
go.sum
View File

@@ -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=

2
pkg/operator/defaults.go
View File

@@ -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"