Skip to content

Commit 28169d8

Browse files
dprincedprince
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
1 parent 8ad0d64 commit 28169d8

File tree

4 files changed

+310
-232
lines changed

4 files changed

+310
-232
lines changed

‎api/go.mod‎

Lines changed: 63 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,74 +3,101 @@ module github.com/openstack-k8s-operators/telemetry-operator/api
33
go 1.24
44

55
require (
6-
github.com/onsi/ginkgo/v2 v2.20.1
7-
github.com/onsi/gomega v1.34.1
6+
github.com/onsi/ginkgo/v2 v2.23.4
7+
github.com/onsi/gomega v1.38.0
88
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182
99
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
1010
github.com/rhobs/observability-operator v0.3.1
11-
k8s.io/api v0.31.12
12-
k8s.io/apimachinery v0.31.12
13-
k8s.io/client-go v0.31.12
11+
k8s.io/api v0.31.13
12+
k8s.io/apimachinery v0.31.13
13+
k8s.io/client-go v0.31.13
1414
sigs.k8s.io/controller-runtime v0.19.7
1515
)
1616

1717
require (
1818
github.com/beorn7/perks v1.0.1 // indirect
1919
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2020
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
21-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
22-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
23-
github.com/fsnotify/fsnotify v1.7.0 // indirect
24-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
21+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
22+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
23+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
24+
github.com/fsnotify/fsnotify v1.9.0 // indirect
25+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
2526
github.com/go-logr/logr v1.4.3 // indirect
2627
github.com/go-logr/zapr v1.3.0 // indirect
27-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
28+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
2829
github.com/go-openapi/jsonreference v0.21.0 // indirect
29-
github.com/go-openapi/swag v0.23.0 // indirect
30+
github.com/go-openapi/swag v0.23.1 // indirect
3031
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3132
github.com/gogo/protobuf v1.3.2 // indirect
3233
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3334
github.com/golang/protobuf v1.5.4 // indirect
34-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
35-
github.com/google/go-cmp v0.6.0 // indirect
35+
github.com/google/gnostic-models v0.7.0 // indirect
36+
github.com/google/go-cmp v0.7.0 // indirect
3637
github.com/google/gofuzz v1.2.0 // indirect
37-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
38+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
3839
github.com/google/uuid v1.6.0 // indirect
3940
github.com/imdario/mergo v0.3.16 // indirect
4041
github.com/josharian/intern v1.0.0 // indirect
4142
github.com/json-iterator/go v1.1.12 // indirect
42-
github.com/mailru/easyjson v0.7.7 // indirect
43+
github.com/mailru/easyjson v0.9.0 // indirect
4344
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4445
github.com/modern-go/reflect2 v1.0.2 // indirect
4546
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
4647
github.com/pkg/errors v0.9.1 // indirect
47-
github.com/prometheus/client_golang v1.19.1 // indirect
48-
github.com/prometheus/client_model v0.6.1 // indirect
49-
github.com/prometheus/common v0.55.0 // indirect
50-
github.com/prometheus/procfs v0.15.1 // indirect
48+
github.com/prometheus/client_golang v1.22.0 // indirect
49+
github.com/prometheus/client_model v0.6.2 // indirect
50+
github.com/prometheus/common v0.65.0 // indirect
51+
github.com/prometheus/procfs v0.16.1 // indirect
5152
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.71.0-rhobs1 // indirect
52-
github.com/spf13/pflag v1.0.5 // indirect
53+
github.com/rogpeppe/go-internal v1.13.1 // indirect
54+
github.com/spf13/pflag v1.0.6 // indirect
5355
github.com/x448/float16 v0.8.4 // indirect
56+
go.uber.org/automaxprocs v1.6.0 // indirect
5457
go.uber.org/multierr v1.11.0 // indirect
5558
go.uber.org/zap v1.27.0 // indirect
56-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
57-
golang.org/x/net v0.28.0 // indirect
58-
golang.org/x/oauth2 v0.21.0 // indirect
59-
golang.org/x/sys v0.23.0 // indirect
60-
golang.org/x/term v0.23.0 // indirect
61-
golang.org/x/text v0.17.0 // indirect
62-
golang.org/x/time v0.5.0 // indirect
63-
golang.org/x/tools v0.24.0 // indirect
64-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
65-
google.golang.org/protobuf v1.34.2 // indirect
59+
go.yaml.in/yaml/v2 v2.4.2 // indirect
60+
go.yaml.in/yaml/v3 v3.0.3 // indirect
61+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
62+
golang.org/x/net v0.42.0 // indirect
63+
golang.org/x/oauth2 v0.30.0 // indirect
64+
golang.org/x/sys v0.34.0 // indirect
65+
golang.org/x/term v0.33.0 // indirect
66+
golang.org/x/text v0.27.0 // indirect
67+
golang.org/x/time v0.12.0 // indirect
68+
golang.org/x/tools v0.34.0 // indirect
69+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
70+
google.golang.org/protobuf v1.36.6 // indirect
6671
gopkg.in/inf.v0 v0.9.1 // indirect
67-
gopkg.in/yaml.v2 v2.4.0 // indirect
6872
gopkg.in/yaml.v3 v3.0.1 // indirect
69-
k8s.io/apiextensions-apiserver v0.31.12 // indirect
73+
k8s.io/apiextensions-apiserver v0.33.2 // indirect
7074
k8s.io/klog/v2 v2.130.1 // indirect
71-
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
75+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
7276
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
73-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
74-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
75-
sigs.k8s.io/yaml v1.4.0 // indirect
77+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
78+
sigs.k8s.io/randfill v1.0.0 // indirect
79+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
80+
sigs.k8s.io/yaml v1.5.0 // indirect
7681
)
82+
83+
// pin these to avoid later versions pulled by rabbitmq
84+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.13 //allow-merging
85+
86+
replace k8s.io/api => k8s.io/api v0.31.13 //allow-merging
87+
88+
replace k8s.io/apiserver => k8s.io/apiserver v0.31.13 //allow-merging
89+
90+
replace k8s.io/client-go => k8s.io/client-go v0.31.13 //allow-merging
91+
92+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.13 //allow-merging
93+
94+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.13 //allow-merging
95+
96+
replace k8s.io/code-generator => k8s.io/code-generator v0.31.13 //allow-merging
97+
98+
replace k8s.io/component-base => k8s.io/component-base v0.31.13 //allow-merging
99+
100+
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.16.0_patches)
101+
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec //allow-merging
102+
103+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging

0 commit comments

Comments
 (0)