Skip to content

Commit 08d7993

Browse files
mkuratczykmkuratczyk
authored
Bump (almost) all deps (#1866)
* Bump almost all deps The exception being client-go, which in version 0.33.0 is not compatbile with Prometheus' Kubernetes discovery right now. * Bump Go from 1.22 to 1.24 in CI * Bump Go from 1.23 to 1.24 in Dockerfile * Bump kind images/versions in CI
1 parent 9cd65f0 commit 08d7993

File tree

8 files changed

+545
-900
lines changed

8 files changed

+545
-900
lines changed

‎.github/workflows/build-test-publish.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ on:
1313
branches: [ "main" ]
1414

1515
env:
16-
GO_VERSION: ~1.22
16+
GO_VERSION: ~1.24
1717
# Taken from https://github.com/kubernetes-sigs/kind/releases/tag/v0.18.0
1818
# The image here should be listed under 'Images built for this release' for the version of kind in go.mod
19-
KIND_NODE_IMAGE: "kindest/node:v1.30.4"
20-
KIND_OLDEST_NODE_IMAGE: "kindest/node:v1.26.6"
19+
KIND_NODE_IMAGE: "kindest/node:v1.32.0"
20+
KIND_OLDEST_NODE_IMAGE: "kindest/node:v1.29.12"
2121
BASELINE_UPGRADE_VERSION: v2.1.0
2222

2323
jobs:

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Build the manager binary
2-
FROM --platform=$BUILDPLATFORM golang:1.23 AS builder
2+
FROM --platform=$BUILDPLATFORM golang:1.24 AS builder
33

44
WORKDIR /workspace
55

‎config/crd/bases/rabbitmq.com_rabbitmqclusters.yaml‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ apiVersion: apiextensions.k8s.io/v1
1010
kind: CustomResourceDefinition
1111
metadata:
1212
annotations:
13-
controller-gen.kubebuilder.io/version: v0.17.0
13+
controller-gen.kubebuilder.io/version: v0.17.3
1414
name: rabbitmqclusters.rabbitmq.com
1515
spec:
1616
group: rabbitmq.com
@@ -329,7 +329,6 @@ spec:
329329
pod labels will be ignored. The default value is empty.
330330
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
331331
Also, matchLabelKeys cannot be set when labelSelector isn't set.
332-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
333332
items:
334333
type: string
335334
type: array
@@ -344,7 +343,6 @@ spec:
344343
pod labels will be ignored. The default value is empty.
345344
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
346345
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
347-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
348346
items:
349347
type: string
350348
type: array
@@ -505,7 +503,6 @@ spec:
505503
pod labels will be ignored. The default value is empty.
506504
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
507505
Also, matchLabelKeys cannot be set when labelSelector isn't set.
508-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
509506
items:
510507
type: string
511508
type: array
@@ -520,7 +517,6 @@ spec:
520517
pod labels will be ignored. The default value is empty.
521518
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
522519
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
523-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
524520
items:
525521
type: string
526522
type: array
@@ -674,7 +670,6 @@ spec:
674670
pod labels will be ignored. The default value is empty.
675671
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
676672
Also, matchLabelKeys cannot be set when labelSelector isn't set.
677-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
678673
items:
679674
type: string
680675
type: array
@@ -689,7 +684,6 @@ spec:
689684
pod labels will be ignored. The default value is empty.
690685
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
691686
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
692-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
693687
items:
694688
type: string
695689
type: array
@@ -850,7 +844,6 @@ spec:
850844
pod labels will be ignored. The default value is empty.
851845
The same key is forbidden to exist in both matchLabelKeys and labelSelector.
852846
Also, matchLabelKeys cannot be set when labelSelector isn't set.
853-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
854847
items:
855848
type: string
856849
type: array
@@ -865,7 +858,6 @@ spec:
865858
pod labels will be ignored. The default value is empty.
866859
The same key is forbidden to exist in both mismatchLabelKeys and labelSelector.
867860
Also, mismatchLabelKeys cannot be set when labelSelector isn't set.
868-
This is a beta field and requires enabling MatchLabelKeysInPodAffinity feature gate (enabled by default).
869861
items:
870862
type: string
871863
type: array
@@ -1845,6 +1837,8 @@ spec:
18451837
- port
18461838
type: object
18471839
type: object
1840+
stopSignal:
1841+
type: string
18481842
type: object
18491843
livenessProbe:
18501844
properties:
@@ -2555,6 +2549,8 @@ spec:
25552549
- port
25562550
type: object
25572551
type: object
2552+
stopSignal:
2553+
type: string
25582554
type: object
25592555
livenessProbe:
25602556
properties:
@@ -3279,6 +3275,8 @@ spec:
32793275
- port
32803276
type: object
32813277
type: object
3278+
stopSignal:
3279+
type: string
32823280
type: object
32833281
livenessProbe:
32843282
properties:

‎controllers/rabbitmqcluster_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ func (r *RabbitmqClusterReconciler) Reconcile(ctx context.Context, req ctrl.Requ
148148
if err == nil {
149149
if v, ok := defaultUserSecret.Labels["app.kubernetes.io/part-of"]; !ok || v != "rabbitmq" {
150150
defaultUserSecret.Labels = metadata.GetLabels(rabbitmqCluster.Name, rabbitmqCluster.Labels)
151-
r.Client.Update(ctx, defaultUserSecret)
151+
_ = r.Client.Update(ctx, defaultUserSecret)
152152
}
153153
}
154154

‎go.mod‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/rabbitmq/cluster-operator/v2
22

3-
go 1.23.0
3+
go 1.24.0
44

5-
toolchain go1.24.1
5+
toolchain go1.24.2
66

77
require (
88
github.com/cloudflare/cfssl v1.6.5
@@ -15,30 +15,30 @@ require (
1515
github.com/rabbitmq/amqp091-go v1.10.0
1616
github.com/rabbitmq/rabbitmq-stream-go-client v1.5.3
1717
golang.org/x/mod v0.24.0
18-
golang.org/x/net v0.39.0
19-
golang.org/x/text v0.24.0
18+
golang.org/x/net v0.40.0
19+
golang.org/x/text v0.25.0
2020
gopkg.in/ini.v1 v1.67.0
21-
k8s.io/api v0.32.1
22-
k8s.io/apimachinery v0.32.4
23-
k8s.io/client-go v0.32.1
21+
k8s.io/api v0.33.0
22+
k8s.io/apimachinery v0.33.0
23+
k8s.io/client-go v0.32.4
2424
k8s.io/klog/v2 v2.130.1
25-
k8s.io/utils v0.0.0-20241210054802-24370beab758
25+
k8s.io/utils v0.0.0-20250502105355-0f33e8f1c979
2626
sigs.k8s.io/controller-runtime v0.20.4
2727
)
2828

2929
require (
3030
github.com/beorn7/perks v1.0.1 // indirect
3131
github.com/cespare/xxhash/v2 v2.3.0 // indirect
3232
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
33-
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
33+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
3434
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
3535
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
36-
github.com/fsnotify/fsnotify v1.8.0 // indirect
37-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
36+
github.com/fsnotify/fsnotify v1.9.0 // indirect
37+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
3838
github.com/go-logr/zapr v1.3.0 // indirect
39-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
39+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
4040
github.com/go-openapi/jsonreference v0.21.0 // indirect
41-
github.com/go-openapi/swag v0.23.0 // indirect
41+
github.com/go-openapi/swag v0.23.1 // indirect
4242
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4343
github.com/gogo/protobuf v1.3.2 // indirect
4444
github.com/golang/protobuf v1.5.4 // indirect
@@ -47,10 +47,9 @@ require (
4747
github.com/google/certificate-transparency-go v1.1.7 // indirect
4848
github.com/google/gnostic-models v0.6.9 // indirect
4949
github.com/google/go-cmp v0.7.0 // indirect
50-
github.com/google/gofuzz v1.2.0 // indirect
5150
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
5251
github.com/google/uuid v1.6.0 // indirect
53-
github.com/gorilla/websocket v1.5.3 // indirect
52+
github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674 // indirect
5453
github.com/jmoiron/sqlx v1.3.5 // indirect
5554
github.com/josharian/intern v1.0.0 // indirect
5655
github.com/json-iterator/go v1.1.12 // indirect
@@ -64,10 +63,10 @@ require (
6463
github.com/pelletier/go-toml v1.9.5 // indirect
6564
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
6665
github.com/pkg/errors v0.9.1 // indirect
67-
github.com/prometheus/client_golang v1.20.5 // indirect
68-
github.com/prometheus/client_model v0.6.1 // indirect
69-
github.com/prometheus/common v0.62.0 // indirect
70-
github.com/prometheus/procfs v0.15.1 // indirect
66+
github.com/prometheus/client_golang v1.22.0 // indirect
67+
github.com/prometheus/client_model v0.6.2 // indirect
68+
github.com/prometheus/common v0.63.0 // indirect
69+
github.com/prometheus/procfs v0.16.1 // indirect
7170
github.com/spaolacci/murmur3 v1.1.0 // indirect
7271
github.com/spf13/pflag v1.0.6 // indirect
7372
github.com/weppos/publicsuffix-go v0.30.2-0.20230730094716-a20f9abcc222 // indirect
@@ -77,21 +76,22 @@ require (
7776
go.uber.org/automaxprocs v1.6.0 // indirect
7877
go.uber.org/multierr v1.11.0 // indirect
7978
go.uber.org/zap v1.27.0 // indirect
80-
golang.org/x/crypto v0.37.0 // indirect
81-
golang.org/x/oauth2 v0.25.0 // indirect
82-
golang.org/x/sync v0.13.0 // indirect
83-
golang.org/x/sys v0.32.0 // indirect
84-
golang.org/x/term v0.31.0 // indirect
85-
golang.org/x/time v0.9.0 // indirect
79+
golang.org/x/crypto v0.38.0 // indirect
80+
golang.org/x/oauth2 v0.30.0 // indirect
81+
golang.org/x/sync v0.14.0 // indirect
82+
golang.org/x/sys v0.33.0 // indirect
83+
golang.org/x/term v0.32.0 // indirect
84+
golang.org/x/time v0.11.0 // indirect
8685
golang.org/x/tools v0.31.0 // indirect
87-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
88-
google.golang.org/protobuf v1.36.5 // indirect
86+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
87+
google.golang.org/protobuf v1.36.6 // indirect
8988
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9089
gopkg.in/inf.v0 v0.9.1 // indirect
9190
gopkg.in/yaml.v3 v3.0.1 // indirect
92-
k8s.io/apiextensions-apiserver v0.32.1 // indirect
93-
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
91+
k8s.io/apiextensions-apiserver v0.32.2 // indirect
92+
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
9493
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
95-
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
94+
sigs.k8s.io/randfill v1.0.0 // indirect
95+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
9696
sigs.k8s.io/yaml v1.4.0 // indirect
9797
)

0 commit comments

Comments
 (0)