Skip to content

Commit ff932ee

Browse files
bwplotkabwplotka
committed
feat: upgrade to 2.53.5 and 0.51.0 common
Signed-off-by: bwplotka <bwplotka@google.com>
1 parent 4a32e4b commit ff932ee

File tree

14 files changed

+184
-490
lines changed

14 files changed

+184
-490
lines changed

‎Makefile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ ifeq ($(CHECK), 1)
147147
else
148148
$(call docker_build, -f ./hack/Dockerfile --target sync -o . -t gmp/sync \
149149
--build-arg RUNCMD='./hack/presubmit.sh all' .)
150-
rm -rf vendor && mv vendor.tmp vendor
151150
go tool addlicense -ignore 'third_party/**' -ignore 'vendor/**' .
152151
endif
153152

@@ -161,7 +160,6 @@ else
161160
# TODO(TheSpiritXIII): Temporary env variables part of `export.go` unit tests.
162161
$(call docker_build, -f ./hack/Dockerfile --target sync -o . -t gmp/hermetic \
163162
--build-arg RUNCMD='GIT_TAG="$(shell git describe --tags --abbrev=0)" TEST_TAG=true ./hack/presubmit.sh test' .)
164-
rm -rf vendor.tmp
165163
endif
166164

167165
GCM_SECRET?=

‎charts/values.global.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ commonLabels: false
1616
namespace:
1717
public: gmp-public
1818
system: gmp-system
19-
version: 0.17.0
19+
version: 0.15.3
2020
images:
2121
# NOTE: All tags have to be quoted otherwise they might be treated as a number.
2222
bash:
@@ -30,16 +30,16 @@ images:
3030
tag: "v2.53.4-gmp.0-gke.1"
3131
configReloader:
3232
image: gke.gcr.io/prometheus-engine/config-reloader
33-
tag: "v0.15.3-gke.1"
33+
tag: "v0.15.3-gke.0"
3434
operator:
3535
image: gke.gcr.io/prometheus-engine/operator
36-
tag: "v0.15.3-gke.1"
36+
tag: "v0.15.3-gke.0"
3737
ruleEvaluator:
3838
image: gke.gcr.io/prometheus-engine/rule-evaluator
39-
tag: "v0.15.3-gke.1"
39+
tag: "v0.15.3-gke.0"
4040
datasourceSyncer:
4141
image: gke.gcr.io/prometheus-engine/datasource-syncer
42-
tag: "v0.15.3-gke.1"
42+
tag: "v0.15.3-gke.0"
4343
resources:
4444
alertManager:
4545
limits:

‎cmd/datasource-syncer/datasource-syncer.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ spec:
4141
- linux
4242
containers:
4343
- name: datasource-syncer-init
44-
image: gke.gcr.io/prometheus-engine/datasource-syncer:v0.15.0-gke.12
44+
image: gke.gcr.io/prometheus-engine/datasource-syncer:v0.15.3-gke.0
4545
args:
4646
- "--datasource-uids=$DATASOURCE_UIDS"
4747
- "--grafana-api-endpoint=$GRAFANA_API_ENDPOINT"
@@ -79,7 +79,7 @@ spec:
7979
- linux
8080
containers:
8181
- name: datasource-syncer
82-
image: gke.gcr.io/prometheus-engine/datasource-syncer:v0.15.0-gke.12
82+
image: gke.gcr.io/prometheus-engine/datasource-syncer:v0.15.3-gke.0
8383
args:
8484
- "--datasource-uids=$DATASOURCE_UIDS"
8585
- "--grafana-api-endpoint=$GRAFANA_API_ENDPOINT"

‎cmd/rule-evaluator/internal/alerts_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ func TestAPI_HandleAlertsEndpoint(t *testing.T) {
4646
ts, _ := time.Parse(time.RFC3339Nano, "2025-04-11T14:03:59.791816+01:00")
4747
// AlertingRule does not allow injecting active alerts, so we use Eval with a fake querier
4848
// that always return 2 series, which will cause alerting rule to contain 2 active alerts.
49-
_, err := a.Eval(t.Context(), ts, func(context.Context, string, time.Time) (promql.Vector, error) {
49+
_, err := a.Eval(t.Context(), 0*time.Second, ts, func(context.Context, string, time.Time) (promql.Vector, error) {
5050
return promql.Vector{
5151
promql.Sample{T: timestamp.FromTime(ts), F: 10, Metric: labels.FromStrings("foo", "bar")},
5252
promql.Sample{T: timestamp.FromTime(ts), F: 11, Metric: labels.FromStrings("foo", "bar2")},

‎cmd/rule-evaluator/main_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ func TestSelect(t *testing.T) {
166166
t.Errorf("Case %d: NewMatcher returned unexpected error: %s", i, err)
167167
}
168168

169-
got := c.db.Select(context.Background(), false, nil, matchers)
169+
got := c.db.Select(t.Context(), false, nil, matchers)
170170
if !cmp.Equal(got.Err(), c.want.Err(), cmp.Comparer(cmpErrsEquality)) {
171171
t.Errorf("Case %d: Expected error: %s, Actual error: %s", i, c.want.Err(), got.Err())
172172
}

‎e2e/ruler_test.go‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,6 @@ alerting:
254254
alertmanagers:
255255
- follow_redirects: true
256256
enable_http2: true
257-
http_headers: null
258257
scheme: http
259258
timeout: 10s
260259
api_version: v2
@@ -270,7 +269,6 @@ alerting:
270269
insecure_skip_verify: false
271270
follow_redirects: true
272271
enable_http2: true
273-
http_headers: null
274272
scheme: https
275273
path_prefix: /test
276274
timeout: 30s
@@ -289,7 +287,6 @@ alerting:
289287
kubeconfig_file: ""
290288
follow_redirects: true
291289
enable_http2: true
292-
http_headers: null
293290
namespaces:
294291
own_namespace: false
295292
names:

‎go.mod‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ require (
2121
github.com/prometheus/alertmanager v0.28.1
2222
github.com/prometheus/client_golang v1.22.0
2323
github.com/prometheus/client_model v0.6.2
24-
github.com/prometheus/common v0.64.0
24+
github.com/prometheus/common v0.62.0
2525
github.com/prometheus/common/assets v0.2.0
26-
github.com/prometheus/prometheus v1.8.2-0.20211119115433-692a54649ed7
26+
github.com/prometheus/prometheus v0.53.5-0.20250630093819-d344ea7bf4cc // v2.53.5.
2727
github.com/stretchr/testify v1.10.0
2828
github.com/thanos-io/thanos v0.34.2-0.20240314081355-f731719f9515
2929
go.uber.org/zap v1.27.0
@@ -32,7 +32,7 @@ require (
3232
golang.org/x/time v0.12.0
3333
google.golang.org/api v0.232.0
3434
google.golang.org/genproto/googleapis/api v0.0.0-20250505200425-f936aa4a68b2
35-
google.golang.org/grpc v1.72.0
35+
google.golang.org/grpc v1.73.0
3636
google.golang.org/protobuf v1.36.6
3737
gopkg.in/yaml.v2 v2.4.0
3838
gopkg.in/yaml.v3 v3.0.1
@@ -55,10 +55,10 @@ require (
5555
github.com/Antonboom/errname v1.1.0 // indirect
5656
github.com/Antonboom/nilnil v1.1.0 // indirect
5757
github.com/Antonboom/testifylint v1.6.0 // indirect
58-
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.11.1 // indirect
59-
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.6.0 // indirect
60-
github.com/Azure/azure-sdk-for-go/sdk/internal v1.8.0 // indirect
61-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
58+
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.18.0 // indirect
59+
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.10.1 // indirect
60+
github.com/Azure/azure-sdk-for-go/sdk/internal v1.11.1 // indirect
61+
github.com/AzureAD/microsoft-authentication-library-for-go v1.4.2 // indirect
6262
github.com/BurntSushi/toml v1.5.0 // indirect
6363
github.com/Crocmagnon/fatcontext v0.7.1 // indirect
6464
github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect
@@ -76,8 +76,9 @@ require (
7676
github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
7777
github.com/ashanbrown/forbidigo v1.6.0 // indirect
7878
github.com/ashanbrown/makezero v1.2.0 // indirect
79-
github.com/aws/aws-sdk-go v1.55.5 // indirect
79+
github.com/aws/aws-sdk-go v1.55.7 // indirect
8080
github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
81+
github.com/bboreham/go-loser v0.0.0-20230920113527-fcc2c21820a3 // indirect
8182
github.com/beorn7/perks v1.0.1 // indirect
8283
github.com/bkielbasa/cyclop v1.2.3 // indirect
8384
github.com/blizzy78/varnamelen v0.8.0 // indirect
@@ -116,6 +117,7 @@ require (
116117
github.com/ettle/strcase v0.2.0 // indirect
117118
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
118119
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
120+
github.com/facette/natsort v0.0.0-20181210072756-2cd4dd1e2dcb // indirect
119121
github.com/fatih/color v1.18.0 // indirect
120122
github.com/fatih/structtag v1.2.0 // indirect
121123
github.com/felixge/httpsnoop v1.0.4 // indirect
@@ -175,13 +177,13 @@ require (
175177
github.com/gostaticanalysis/comment v1.5.0 // indirect
176178
github.com/gostaticanalysis/forcetypeassert v0.2.0 // indirect
177179
github.com/gostaticanalysis/nilerr v0.1.1 // indirect
178-
github.com/grafana/regexp v0.0.0-20221122212121-6b5c0a4cb7fd // indirect
180+
github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc // indirect
179181
github.com/hashicorp/go-immutable-radix/v2 v2.1.0 // indirect
180182
github.com/hashicorp/go-version v1.7.0 // indirect
181183
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
182184
github.com/hashicorp/hcl v1.0.0 // indirect
183185
github.com/hexops/gotextdiff v1.0.3 // indirect
184-
github.com/imdario/mergo v0.3.13 // indirect
186+
github.com/imdario/mergo v0.3.16 // indirect
185187
github.com/inconshreveable/mousetrap v1.1.0 // indirect
186188
github.com/jgautheron/goconst v1.7.1 // indirect
187189
github.com/jingyugao/rowserrcheck v1.1.1 // indirect
@@ -300,6 +302,8 @@ require (
300302
go-simpler.org/sloglint v0.9.0 // indirect
301303
go.mongodb.org/mongo-driver v1.14.0 // indirect
302304
go.opentelemetry.io/auto/sdk v1.1.0 // indirect
305+
go.opentelemetry.io/collector/pdata v1.8.0 // indirect
306+
go.opentelemetry.io/collector/semconv v0.101.0 // indirect
303307
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0 // indirect
304308
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.60.0 // indirect
305309
go.opentelemetry.io/otel v1.35.0 // indirect
@@ -309,15 +313,15 @@ require (
309313
go.uber.org/automaxprocs v1.6.0 // indirect
310314
go.uber.org/goleak v1.3.0 // indirect
311315
go.uber.org/multierr v1.11.0 // indirect
312-
golang.org/x/crypto v0.38.0 // indirect
316+
golang.org/x/crypto v0.39.0 // indirect
313317
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
314318
golang.org/x/exp/typeparams v0.0.0-20250210185358-939b2ce775ac // indirect
315-
golang.org/x/net v0.40.0 // indirect
316-
golang.org/x/sync v0.14.0 // indirect
319+
golang.org/x/net v0.41.0 // indirect
320+
golang.org/x/sync v0.15.0 // indirect
317321
golang.org/x/sys v0.33.0 // indirect
318322
golang.org/x/term v0.32.0 // indirect
319-
golang.org/x/text v0.25.0 // indirect
320-
golang.org/x/tools v0.31.0 // indirect
323+
golang.org/x/text v0.26.0 // indirect
324+
golang.org/x/tools v0.33.0 // indirect
321325
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
322326
google.golang.org/genproto v0.0.0-20250505200425-f936aa4a68b2 // indirect
323327
google.golang.org/genproto/googleapis/rpc v0.0.0-20250505200425-f936aa4a68b2 // indirect
@@ -336,12 +340,9 @@ require (
336340
sigs.k8s.io/yaml v1.4.0 // indirect
337341
)
338342

339-
replace (
340-
// We pin version of Prometheus manually as it does not follow stable Go versioning
341-
// and currently, GMP operator Prometheus dep and operated collector image has to
342-
// match.
343-
github.com/prometheus/prometheus => github.com/prometheus/prometheus v2.53.5
344-
)
343+
// TODO(bwplotka): We have to pin common to avoid auto-upgrades which are in compatible with Prometheus v2.53.5.
344+
// Remove once this version moves to newer Prometheus.
345+
replace github.com/prometheus/common => github.com/prometheus/common v0.61.0
345346

346347
tool (
347348
github.com/golangci/golangci-lint/v2/cmd/golangci-lint

0 commit comments

Comments
 (0)