Skip to content

Commit 89df4b9

Browse files
ZerpetZerpet
authored
Merge pull request #1810 from rabbitmq/chore/update-deps
Update deps
2 parents 6397d8f + fd010db commit 89df4b9

File tree

4 files changed

+115
-86
lines changed

4 files changed

+115
-86
lines changed

‎Dockerfile

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

44
WORKDIR /workspace
55

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

+38-3
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.16.3
13+
controller-gen.kubebuilder.io/version: v0.17.0
1414
name: rabbitmqclusters.rabbitmq.com
1515
spec:
1616
group: rabbitmq.com
@@ -3783,6 +3783,39 @@ spec:
37833783
x-kubernetes-list-map-keys:
37843784
- name
37853785
x-kubernetes-list-type: map
3786+
resources:
3787+
properties:
3788+
claims:
3789+
items:
3790+
properties:
3791+
name:
3792+
type: string
3793+
request:
3794+
type: string
3795+
required:
3796+
- name
3797+
type: object
3798+
type: array
3799+
x-kubernetes-list-map-keys:
3800+
- name
3801+
x-kubernetes-list-type: map
3802+
limits:
3803+
additionalProperties:
3804+
anyOf:
3805+
- type: integer
3806+
- type: string
3807+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
3808+
x-kubernetes-int-or-string: true
3809+
type: object
3810+
requests:
3811+
additionalProperties:
3812+
anyOf:
3813+
- type: integer
3814+
- type: string
3815+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
3816+
x-kubernetes-int-or-string: true
3817+
type: object
3818+
type: object
37863819
restartPolicy:
37873820
type: string
37883821
runtimeClassName:
@@ -3825,6 +3858,8 @@ spec:
38253858
runAsUser:
38263859
format: int64
38273860
type: integer
3861+
seLinuxChangePolicy:
3862+
type: string
38283863
seLinuxOptions:
38293864
properties:
38303865
level:
@@ -5154,7 +5189,7 @@ spec:
51545189
description: |-
51555190
Name of a Secret in the same Namespace as the RabbitmqCluster, containing the Certificate Authority's public certificate for TLS.
51565191
The Secret must store this as ca.crt.
5157-
This Secret can be created by running `kubectl create secret generic ca-secret --from-file=ca.crt=path/to/ca.cert`
5192+
This Secret can be created by running `kubectl create secret generic ca-secret --from-file=ca.crt=path/to/ca.crt`
51585193
Used for mTLS, and TLS for rabbitmq_web_stomp and rabbitmq_web_mqtt.
51595194
type: string
51605195
disableNonTLSListeners:
@@ -5166,7 +5201,7 @@ spec:
51665201
description: |-
51675202
Name of a Secret in the same Namespace as the RabbitmqCluster, containing the server's private key & public certificate for TLS.
51685203
The Secret must store these as tls.key and tls.crt, respectively.
5169-
This Secret can be created by running `kubectl create secret tls tls-secret --cert=path/to/tls.cert --key=path/to/tls.key`
5204+
This Secret can be created by running `kubectl create secret tls tls-secret --cert=path/to/tls.crt --key=path/to/tls.key`
51705205
type: string
51715206
type: object
51725207
tolerations:

‎go.mod

+26-28
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
module github.com/rabbitmq/cluster-operator/v2
22

3-
go 1.22.7
3+
go 1.23.0
44

5-
toolchain go1.23.0
5+
toolchain go1.23.4
66

77
require (
88
github.com/cloudflare/cfssl v1.6.5
@@ -15,15 +15,15 @@ require (
1515
github.com/rabbitmq/amqp091-go v1.10.0
1616
github.com/rabbitmq/rabbitmq-stream-go-client v1.4.11
1717
golang.org/x/mod v0.22.0
18-
golang.org/x/net v0.33.0
18+
golang.org/x/net v0.34.0
1919
golang.org/x/text v0.21.0
2020
gopkg.in/ini.v1 v1.67.0
21-
k8s.io/api v0.31.2
22-
k8s.io/apimachinery v0.31.3
23-
k8s.io/client-go v0.31.2
21+
k8s.io/api v0.32.1
22+
k8s.io/apimachinery v0.32.1
23+
k8s.io/client-go v0.32.1
2424
k8s.io/klog/v2 v2.130.1
25-
k8s.io/utils v0.0.0-20240921022957-49e7df575cb6
26-
sigs.k8s.io/controller-runtime v0.19.3
25+
k8s.io/utils v0.0.0-20241210054802-24370beab758
26+
sigs.k8s.io/controller-runtime v0.20.0
2727
)
2828

2929
require (
@@ -33,29 +33,29 @@ require (
3333
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
3434
github.com/evanphx/json-patch v5.7.0+incompatible // indirect
3535
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
36+
github.com/fsnotify/fsnotify v1.8.0 // indirect
3637
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3738
github.com/go-logr/zapr v1.3.0 // indirect
3839
github.com/go-openapi/jsonpointer v0.21.0 // indirect
3940
github.com/go-openapi/jsonreference v0.21.0 // indirect
4041
github.com/go-openapi/swag v0.23.0 // indirect
4142
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
4243
github.com/gogo/protobuf v1.3.2 // indirect
43-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
4444
github.com/golang/protobuf v1.5.4 // indirect
4545
github.com/golang/snappy v0.0.4 // indirect
46+
github.com/google/btree v1.1.3 // indirect
4647
github.com/google/certificate-transparency-go v1.1.7 // indirect
47-
github.com/google/gnostic-models v0.6.8 // indirect
48+
github.com/google/gnostic-models v0.6.9 // indirect
4849
github.com/google/go-cmp v0.6.0 // indirect
4950
github.com/google/gofuzz v1.2.0 // indirect
5051
github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad // indirect
5152
github.com/google/uuid v1.6.0 // indirect
5253
github.com/gorilla/websocket v1.5.3 // indirect
53-
github.com/imdario/mergo v0.3.16 // indirect
5454
github.com/jmoiron/sqlx v1.3.5 // indirect
5555
github.com/josharian/intern v1.0.0 // indirect
5656
github.com/json-iterator/go v1.1.12 // indirect
57-
github.com/klauspost/compress v1.17.10 // indirect
58-
github.com/mailru/easyjson v0.7.7 // indirect
57+
github.com/klauspost/compress v1.17.11 // indirect
58+
github.com/mailru/easyjson v0.9.0 // indirect
5959
github.com/moby/spdystream v0.5.0 // indirect
6060
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
6161
github.com/modern-go/reflect2 v1.0.2 // indirect
@@ -64,9 +64,9 @@ require (
6464
github.com/pelletier/go-toml v1.9.5 // indirect
6565
github.com/pierrec/lz4 v2.6.1+incompatible // indirect
6666
github.com/pkg/errors v0.9.1 // indirect
67-
github.com/prometheus/client_golang v1.20.4 // indirect
67+
github.com/prometheus/client_golang v1.20.5 // indirect
6868
github.com/prometheus/client_model v0.6.1 // indirect
69-
github.com/prometheus/common v0.59.1 // indirect
69+
github.com/prometheus/common v0.62.0 // indirect
7070
github.com/prometheus/procfs v0.15.1 // indirect
7171
github.com/spaolacci/murmur3 v1.1.0 // indirect
7272
github.com/spf13/pflag v1.0.5 // indirect
@@ -76,23 +76,21 @@ require (
7676
github.com/zmap/zlint/v3 v3.6.0 // indirect
7777
go.uber.org/multierr v1.11.0 // indirect
7878
go.uber.org/zap v1.27.0 // indirect
79-
golang.org/x/crypto v0.31.0 // indirect
80-
golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
81-
golang.org/x/oauth2 v0.23.0 // indirect
79+
golang.org/x/crypto v0.32.0 // indirect
80+
golang.org/x/oauth2 v0.25.0 // indirect
8281
golang.org/x/sync v0.10.0 // indirect
83-
golang.org/x/sys v0.28.0 // indirect
84-
golang.org/x/term v0.27.0 // indirect
85-
golang.org/x/time v0.6.0 // indirect
86-
golang.org/x/tools v0.28.0 // indirect
82+
golang.org/x/sys v0.29.0 // indirect
83+
golang.org/x/term v0.28.0 // indirect
84+
golang.org/x/time v0.9.0 // indirect
85+
golang.org/x/tools v0.29.0 // indirect
8786
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
88-
google.golang.org/protobuf v1.36.1 // indirect
87+
google.golang.org/protobuf v1.36.3 // indirect
8988
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
9089
gopkg.in/inf.v0 v0.9.1 // indirect
91-
gopkg.in/yaml.v2 v2.4.0 // indirect
9290
gopkg.in/yaml.v3 v3.0.1 // indirect
93-
k8s.io/apiextensions-apiserver v0.31.2 // indirect
94-
k8s.io/kube-openapi v0.0.0-20240903163716-9e1beecbcb38 // indirect
95-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
96-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
91+
k8s.io/apiextensions-apiserver v0.32.1 // indirect
92+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
93+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
94+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
9795
sigs.k8s.io/yaml v1.4.0 // indirect
9896
)

0 commit comments

Comments
 (0)