Skip to content

Commit 1e37910

Browse files
stuggistuggi
committed
Bump rabbitmq-cluster-operator dependency
Bumps rabbitmq-cluster-operator to 2.16.0 [1] and pins k8s.io dependencies to 0.31.x and k8s.io/kube-openapi to v0.0.0-20250627150254-e9823e99808e until our main target platform is OCP 4.18. rabbitmq-cluster-operator imports 0.33.x which matches OCP 4.20. We can remove it when our main target platform switches to this. [1] openstack-k8s-operators/infra-operator@aa94a21 Signed-off-by: Martin Schuppert <[email protected]>
1 parent 475bf5f commit 1e37910

File tree

4 files changed

+217
-155
lines changed

4 files changed

+217
-155
lines changed

‎api/go.mod‎

Lines changed: 50 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
module github.com/openstack-k8s-operators/designate-operator/api
22

3-
go 1.24
3+
go 1.24.4
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.25.1
6+
github.com/onsi/ginkgo/v2 v2.25.3
77
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
88
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20250922082314-c83d83092a04
99
k8s.io/api v0.31.13
@@ -22,60 +22,85 @@ require (
2222
github.com/beorn7/perks v1.0.1 // indirect
2323
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2424
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
25-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
26-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
27-
github.com/fsnotify/fsnotify v1.7.0 // indirect
28-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
25+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
26+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
27+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
28+
github.com/fsnotify/fsnotify v1.9.0 // indirect
29+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
2930
github.com/go-logr/logr v1.4.3 // indirect
3031
github.com/go-logr/zapr v1.3.0 // indirect
31-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
32+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
3233
github.com/go-openapi/jsonreference v0.21.0 // indirect
33-
github.com/go-openapi/swag v0.23.0 // indirect
34+
github.com/go-openapi/swag v0.23.1 // indirect
3435
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3536
github.com/gogo/protobuf v1.3.2 // indirect
3637
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3738
github.com/golang/protobuf v1.5.4 // indirect
38-
github.com/google/gnostic-models v0.6.8 // indirect
39+
github.com/google/gnostic-models v0.7.0 // indirect
3940
github.com/google/go-cmp v0.7.0 // indirect
4041
github.com/google/gofuzz v1.2.0 // indirect
4142
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4243
github.com/google/uuid v1.6.0 // indirect
4344
github.com/imdario/mergo v0.3.16 // indirect
4445
github.com/josharian/intern v1.0.0 // indirect
4546
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/mailru/easyjson v0.7.7 // indirect
47+
github.com/mailru/easyjson v0.9.0 // indirect
4748
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4849
github.com/modern-go/reflect2 v1.0.2 // indirect
4950
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5051
github.com/pkg/errors v0.9.1 // indirect
51-
github.com/prometheus/client_golang v1.19.1 // indirect
52-
github.com/prometheus/client_model v0.6.1 // indirect
53-
github.com/prometheus/common v0.55.0 // indirect
54-
github.com/prometheus/procfs v0.15.1 // indirect
55-
github.com/spf13/pflag v1.0.5 // indirect
52+
github.com/prometheus/client_golang v1.22.0 // indirect
53+
github.com/prometheus/client_model v0.6.2 // indirect
54+
github.com/prometheus/common v0.65.0 // indirect
55+
github.com/prometheus/procfs v0.16.1 // indirect
56+
github.com/rogpeppe/go-internal v1.13.1 // indirect
57+
github.com/spf13/pflag v1.0.6 // indirect
5658
github.com/x448/float16 v0.8.4 // indirect
5759
go.uber.org/automaxprocs v1.6.0 // indirect
5860
go.uber.org/multierr v1.11.0 // indirect
5961
go.uber.org/zap v1.27.0 // indirect
62+
go.yaml.in/yaml/v2 v2.4.2 // indirect
6063
go.yaml.in/yaml/v3 v3.0.4 // indirect
61-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
64+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
6265
golang.org/x/net v0.43.0 // indirect
63-
golang.org/x/oauth2 v0.21.0 // indirect
66+
golang.org/x/oauth2 v0.30.0 // indirect
6467
golang.org/x/sys v0.35.0 // indirect
6568
golang.org/x/term v0.34.0 // indirect
6669
golang.org/x/text v0.28.0 // indirect
67-
golang.org/x/time v0.5.0 // indirect
70+
golang.org/x/time v0.12.0 // indirect
6871
golang.org/x/tools v0.36.0 // indirect
69-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
72+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
7073
google.golang.org/protobuf v1.36.7 // indirect
7174
gopkg.in/inf.v0 v0.9.1 // indirect
72-
gopkg.in/yaml.v2 v2.4.0 // indirect
7375
gopkg.in/yaml.v3 v3.0.1 // indirect
74-
k8s.io/apiextensions-apiserver v0.31.13 // indirect
76+
k8s.io/apiextensions-apiserver v0.33.2 // indirect
7577
k8s.io/klog/v2 v2.130.1 // indirect
76-
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
78+
k8s.io/kube-openapi v0.0.0-20250902184714-7fc278399c7f // indirect
7779
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
78-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
79-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
80-
sigs.k8s.io/yaml v1.4.0 // indirect
80+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
81+
sigs.k8s.io/randfill v1.0.0 // indirect
82+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
83+
sigs.k8s.io/yaml v1.6.0 // indirect
8184
)
85+
86+
// pin these to avoid later versions pulled by rabbitmq
87+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.13 //allow-merging
88+
89+
replace k8s.io/api => k8s.io/api v0.31.13 //allow-merging
90+
91+
replace k8s.io/apiserver => k8s.io/apiserver v0.31.13 //allow-merging
92+
93+
replace k8s.io/client-go => k8s.io/client-go v0.31.13 //allow-merging
94+
95+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.13 //allow-merging
96+
97+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.13 //allow-merging
98+
99+
replace k8s.io/code-generator => k8s.io/code-generator v0.31.13 //allow-merging
100+
101+
replace k8s.io/component-base => k8s.io/component-base v0.31.13 //allow-merging
102+
103+
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.16.0_patches)
104+
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec //allow-merging
105+
106+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging

0 commit comments

Comments
 (0)