Skip to content

Commit eda4e9d

Browse files
stuggiopenshift-merge-bot[bot]
authored andcommitted
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 Jira: OSPRH-20205 Signed-off-by: Martin Schuppert <[email protected]>
1 parent 12e6461 commit eda4e9d

File tree

4 files changed

+307
-232
lines changed

4 files changed

+307
-232
lines changed

api/go.mod

Lines changed: 61 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,98 @@
11
module github.com/openstack-k8s-operators/placement-operator/api
22

3-
go 1.24
3+
go 1.24.4
44

55
require (
66
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182
77
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
8-
k8s.io/api v0.31.12
9-
k8s.io/apimachinery v0.31.12
8+
k8s.io/api v0.31.13
9+
k8s.io/apimachinery v0.31.13
1010
sigs.k8s.io/controller-runtime v0.19.7
1111
)
1212

1313
require (
1414
github.com/beorn7/perks v1.0.1 // indirect
1515
github.com/cespare/xxhash/v2 v2.3.0 // indirect
1616
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
17-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
18-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
19-
github.com/fsnotify/fsnotify v1.7.0 // indirect
20-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
17+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
18+
github.com/evanphx/json-patch v5.9.11+incompatible // indirect
19+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
20+
github.com/fsnotify/fsnotify v1.9.0 // indirect
21+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
2122
github.com/go-logr/logr v1.4.3 // indirect
22-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
23+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
2324
github.com/go-openapi/jsonreference v0.21.0 // indirect
24-
github.com/go-openapi/swag v0.23.0 // indirect
25+
github.com/go-openapi/swag v0.23.1 // indirect
2526
github.com/gogo/protobuf v1.3.2 // indirect
2627
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2728
github.com/golang/protobuf v1.5.4 // indirect
28-
github.com/google/gnostic-models v0.6.8 // indirect
29-
github.com/google/go-cmp v0.6.0 // indirect
29+
github.com/google/gnostic-models v0.7.0 // indirect
30+
github.com/google/go-cmp v0.7.0 // indirect
3031
github.com/google/gofuzz v1.2.0 // indirect
3132
github.com/google/uuid v1.6.0 // indirect
3233
github.com/imdario/mergo v0.3.16 // indirect
3334
github.com/josharian/intern v1.0.0 // indirect
3435
github.com/json-iterator/go v1.1.12 // indirect
35-
github.com/mailru/easyjson v0.7.7 // indirect
36+
github.com/mailru/easyjson v0.9.0 // indirect
3637
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3738
github.com/modern-go/reflect2 v1.0.2 // indirect
3839
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
40+
github.com/onsi/ginkgo/v2 v2.23.4 // indirect
41+
github.com/onsi/gomega v1.38.0 // indirect
3942
github.com/pkg/errors v0.9.1 // indirect
40-
github.com/prometheus/client_golang v1.19.1 // indirect
41-
github.com/prometheus/client_model v0.6.1 // indirect
42-
github.com/prometheus/common v0.55.0 // indirect
43-
github.com/prometheus/procfs v0.15.1 // indirect
44-
github.com/spf13/pflag v1.0.5 // indirect
43+
github.com/prometheus/client_golang v1.22.0 // indirect
44+
github.com/prometheus/client_model v0.6.2 // indirect
45+
github.com/prometheus/common v0.65.0 // indirect
46+
github.com/prometheus/procfs v0.16.1 // indirect
47+
github.com/rogpeppe/go-internal v1.13.1 // indirect
48+
github.com/spf13/pflag v1.0.6 // indirect
4549
github.com/x448/float16 v0.8.4 // indirect
46-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
47-
golang.org/x/net v0.28.0 // indirect
48-
golang.org/x/oauth2 v0.21.0 // indirect
49-
golang.org/x/sys v0.23.0 // indirect
50-
golang.org/x/term v0.23.0 // indirect
51-
golang.org/x/text v0.17.0 // indirect
52-
golang.org/x/time v0.5.0 // indirect
53-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
54-
google.golang.org/protobuf v1.34.2 // indirect
50+
go.yaml.in/yaml/v2 v2.4.2 // indirect
51+
go.yaml.in/yaml/v3 v3.0.3 // indirect
52+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67 // indirect
53+
golang.org/x/net v0.42.0 // indirect
54+
golang.org/x/oauth2 v0.30.0 // indirect
55+
golang.org/x/sys v0.34.0 // indirect
56+
golang.org/x/term v0.33.0 // indirect
57+
golang.org/x/text v0.27.0 // indirect
58+
golang.org/x/time v0.12.0 // indirect
59+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
60+
google.golang.org/protobuf v1.36.6 // indirect
5561
gopkg.in/inf.v0 v0.9.1 // indirect
56-
gopkg.in/yaml.v2 v2.4.0 // indirect
5762
gopkg.in/yaml.v3 v3.0.1 // indirect
58-
k8s.io/apiextensions-apiserver v0.31.12 // indirect
59-
k8s.io/client-go v0.31.12 // indirect
63+
k8s.io/apiextensions-apiserver v0.33.2 // indirect
64+
k8s.io/client-go v0.31.13 // indirect
6065
k8s.io/klog/v2 v2.130.1 // indirect
61-
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
66+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
6267
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
63-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
64-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
65-
sigs.k8s.io/yaml v1.4.0 // indirect
68+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
69+
sigs.k8s.io/randfill v1.0.0 // indirect
70+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
71+
sigs.k8s.io/yaml v1.5.0 // indirect
6672
)
6773

6874
// mschuppert: map to latest commit from release-4.18 tag
6975
// must consistent within modules and service operators
7076
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging
77+
78+
// pin these to avoid later versions pulled by rabbitmq
79+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.13 //allow-merging
80+
81+
replace k8s.io/api => k8s.io/api v0.31.13 //allow-merging
82+
83+
replace k8s.io/apiserver => k8s.io/apiserver v0.31.13 //allow-merging
84+
85+
replace k8s.io/client-go => k8s.io/client-go v0.31.13 //allow-merging
86+
87+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.13 //allow-merging
88+
89+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.13 //allow-merging
90+
91+
replace k8s.io/code-generator => k8s.io/code-generator v0.31.13 //allow-merging
92+
93+
replace k8s.io/component-base => k8s.io/component-base v0.31.13 //allow-merging
94+
95+
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.16.0_patches)
96+
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec //allow-merging
97+
98+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging

0 commit comments

Comments
 (0)