Skip to content

Commit 4f99b04

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #497 from stuggi/pin_k8s
Bump rabbitmq-cluster-operator dependency
2 parents dfbc602 + f52d0ba commit 4f99b04

File tree

4 files changed

+210
-147
lines changed

4 files changed

+210
-147
lines changed

‎api/go.mod‎

Lines changed: 32 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
module github.com/openstack-k8s-operators/ovn-operator/api
22

3-
go 1.24
3+
go 1.24.4
44

55
require (
66
github.com/go-logr/logr v1.4.3
77
github.com/google/uuid v1.6.0
88
github.com/onsi/gomega v1.34.1
99
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182
1010
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
11-
k8s.io/api v0.31.12
12-
k8s.io/apimachinery v0.31.12
11+
k8s.io/api v0.31.13
12+
k8s.io/apimachinery v0.31.13
1313
sigs.k8s.io/controller-runtime v0.19.7
1414
)
1515

@@ -27,7 +27,7 @@ require (
2727
github.com/gogo/protobuf v1.3.2 // indirect
2828
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
2929
github.com/golang/protobuf v1.5.4 // indirect
30-
github.com/google/gnostic-models v0.6.8 // indirect
30+
github.com/google/gnostic-models v0.7.0 // indirect
3131
github.com/google/go-cmp v0.6.0 // indirect
3232
github.com/google/gofuzz v1.2.0 // indirect
3333
github.com/imdario/mergo v0.3.16 // indirect
@@ -46,6 +46,8 @@ require (
4646
github.com/prometheus/procfs v0.15.1 // indirect
4747
github.com/spf13/pflag v1.0.5 // indirect
4848
github.com/x448/float16 v0.8.4 // indirect
49+
go.yaml.in/yaml/v2 v2.4.2 // indirect
50+
go.yaml.in/yaml/v3 v3.0.3 // indirect
4951
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
5052
golang.org/x/net v0.28.0 // indirect
5153
golang.org/x/oauth2 v0.21.0 // indirect
@@ -54,18 +56,40 @@ require (
5456
golang.org/x/text v0.17.0 // indirect
5557
golang.org/x/time v0.5.0 // indirect
5658
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
57-
google.golang.org/protobuf v1.34.2 // indirect
59+
google.golang.org/protobuf v1.35.1 // indirect
5860
gopkg.in/inf.v0 v0.9.1 // indirect
59-
gopkg.in/yaml.v2 v2.4.0 // indirect
6061
gopkg.in/yaml.v3 v3.0.1 // indirect
6162
k8s.io/apiextensions-apiserver v0.31.12 // indirect
62-
k8s.io/client-go v0.31.12 // indirect
63+
k8s.io/client-go v0.31.13 // indirect
6364
k8s.io/klog/v2 v2.130.1 // indirect
6465
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
6566
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d // indirect
6667
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
67-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
68+
sigs.k8s.io/randfill v1.0.0 // indirect
69+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
6870
sigs.k8s.io/yaml v1.4.0 // indirect
6971
)
7072

7173
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging
74+
75+
// pin these to avoid later versions pulled by rabbitmq
76+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.13 //allow-merging
77+
78+
replace k8s.io/api => k8s.io/api v0.31.13 //allow-merging
79+
80+
replace k8s.io/apiserver => k8s.io/apiserver v0.31.13 //allow-merging
81+
82+
replace k8s.io/client-go => k8s.io/client-go v0.31.13 //allow-merging
83+
84+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.13 //allow-merging
85+
86+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.13 //allow-merging
87+
88+
replace k8s.io/code-generator => k8s.io/code-generator v0.31.13 //allow-merging
89+
90+
replace k8s.io/component-base => k8s.io/component-base v0.31.13 //allow-merging
91+
92+
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.16.0_patches)
93+
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec //allow-merging
94+
95+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging

‎api/go.sum‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da h1:oI5xCqsCo564l
3434
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
3535
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
3636
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
37-
github.com/google/gnostic-models v0.6.8 h1:yo/ABAfM5IMRsS1VnXjTBvUb61tFIHozhlYvRgGre9I=
38-
github.com/google/gnostic-models v0.6.8/go.mod h1:5n7qKqH0f5wFt+aWF8CW6pZLLNOfYuF5OpfBSENuI8U=
37+
github.com/google/gnostic-models v0.7.0 h1:qwTtogB15McXDaNqTZdzPJRHvaVJlAl+HVQnLmJEJxo=
38+
github.com/google/gnostic-models v0.7.0/go.mod h1:whL5G0m6dmc5cPxKc5bdKdEN3UjI7OUGxBlw57miDrQ=
3939
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
4040
github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
4141
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -111,6 +111,10 @@ go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
111111
go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
112112
go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
113113
go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
114+
go.yaml.in/yaml/v2 v2.4.2 h1:DzmwEr2rDGHl7lsFgAHxmNz/1NlQ7xLIrlN2h5d1eGI=
115+
go.yaml.in/yaml/v2 v2.4.2/go.mod h1:081UH+NErpNdqlCXm3TtEran0rJZGxAYx9hb/ELlsPU=
116+
go.yaml.in/yaml/v3 v3.0.3 h1:bXOww4E/J3f66rav3pX3m8w6jDE4knZjGOw8b5Y6iNE=
117+
go.yaml.in/yaml/v3 v3.0.3/go.mod h1:tBHosrYAkRZjRAOREWbDnBXUf08JOwYq++0QNwQiWzI=
114118
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
115119
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
116120
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -154,39 +158,39 @@ golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8T
154158
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
155159
gomodules.xyz/jsonpatch/v2 v2.4.0 h1:Ci3iUJyx9UeRx7CeFN8ARgGbkESwJK+KB9lLcWxY/Zw=
156160
gomodules.xyz/jsonpatch/v2 v2.4.0/go.mod h1:AH3dM2RI6uoBZxn3LVrfvJ3E0/9dG4cSrbuBJT4moAY=
157-
google.golang.org/protobuf v1.34.2 h1:6xV6lTsCfpGD21XK49h7MhtcApnLqkfYgPcdHftf6hg=
158-
google.golang.org/protobuf v1.34.2/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
161+
google.golang.org/protobuf v1.35.1 h1:m3LfL6/Ca+fqnjnlqQXNpFPABW1UD7mjh8KO2mKFytA=
162+
google.golang.org/protobuf v1.35.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
159163
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
160164
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
161165
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
162166
gopkg.in/evanphx/json-patch.v4 v4.12.0 h1:n6jtcsulIzXPJaxegRbvFNNrZDjbij7ny3gmSPG+6V4=
163167
gopkg.in/evanphx/json-patch.v4 v4.12.0/go.mod h1:p8EYWUEYMpynmqDbY58zCKCFZw8pRWMG4EsWvDvM72M=
164168
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
165169
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
166-
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
167-
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
168-
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
169170
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
170171
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
171-
k8s.io/api v0.31.12 h1:yysm83xHIoKAwfm2w0dT6Yz7vfWzl841AEMI7Y8wDa8=
172-
k8s.io/api v0.31.12/go.mod h1:f/srhhI7aDs9K4s0W1GX4/zb+cIf5uWrBjGyoO/XgJc=
173-
k8s.io/apiextensions-apiserver v0.31.12 h1:d32I3VReAly5Qoc9ZXhO4/iObYmm7Jk6VvAeRAbg/MA=
174-
k8s.io/apiextensions-apiserver v0.31.12/go.mod h1:KcBI/Z/WQmbffBwfqQmqHhALhvun5JNJJh8Y29CJwUo=
175-
k8s.io/apimachinery v0.31.12 h1:y34W8rNKc+jDxUvEXarjahqM6vOV5iqgZPuRqRuyEh8=
176-
k8s.io/apimachinery v0.31.12/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
177-
k8s.io/client-go v0.31.12 h1:JJhouOoU1bKdPWplkZ2CpYA74+lxj3Zsn15aoGLX6Hk=
178-
k8s.io/client-go v0.31.12/go.mod h1:kjQ5WSec9ShP3T1auTDFW4bTqgmJdBuZPsjq5FqeuYE=
172+
k8s.io/api v0.31.13 h1:sco9Cq2pY4Ysv9qZiWzcR97MmA/35nwYQ/VCTzOcWmc=
173+
k8s.io/api v0.31.13/go.mod h1:4D8Ry8RqqLDemNLwGYC6v5wOy51N7hitr4WQ6oSWfLY=
174+
k8s.io/apiextensions-apiserver v0.31.13 h1:8xtWKVpV/YbYX0UX2k6w+cgxfxKhX0UNGuo/VXAdg8g=
175+
k8s.io/apiextensions-apiserver v0.31.13/go.mod h1:zxpMLWXBxnJqKUIruJ+ulP+Xlfe5lPZPxq1z0cLwA2U=
176+
k8s.io/apimachinery v0.31.13 h1:rkG0EiBkBkEzURo/8dKGx/oBF202Z2LqHuSD8Cm3bG4=
177+
k8s.io/apimachinery v0.31.13/go.mod h1:rsPdaZJfTfLsNJSQzNHQvYoTmxhoOEofxtOsF3rtsMo=
178+
k8s.io/client-go v0.31.13 h1:Q0LG51uFbzNd9fzIj5ilA0Sm1wUholHvDaNwVKzqdCA=
179+
k8s.io/client-go v0.31.13/go.mod h1:UB4yTzQeRAv+vULOKp2jdqA5LSwV55bvc3RQ5tM48LM=
179180
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
180181
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
181-
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 h1:qVoMaQV5t62UUvHe16Q3eb2c5HPzLHYzsi0Tu/xLndo=
182-
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940/go.mod h1:yD4MZYeKMBwQKVht279WycxKyM84kkAx2DPrTXaeb98=
182+
k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e h1:UGI9rv1A2cV87NhXr4s+AUBxIuoo/SME/IyJ3b6KztE=
183+
k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e/go.mod h1:GLOk5B+hDbRROvt0X2+hqX64v/zO3vXN7J78OUmBSKw=
183184
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d h1:wAhiDyZ4Tdtt7e46e9M5ZSAJ/MnPGPs+Ki1gHw4w1R0=
184185
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
185186
sigs.k8s.io/controller-runtime v0.19.7 h1:DLABZfMr20A+AwCZOHhcbcu+TqBXnJZaVBri9K3EO48=
186187
sigs.k8s.io/controller-runtime v0.19.7/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
187188
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
188189
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
189-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
190-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
190+
sigs.k8s.io/randfill v0.0.0-20250304075658-069ef1bbf016/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
191+
sigs.k8s.io/randfill v1.0.0 h1:JfjMILfT8A6RbawdsK2JXGBR5AQVfd+9TbzrlneTyrU=
192+
sigs.k8s.io/randfill v1.0.0/go.mod h1:XeLlZ/jmk4i1HRopwe7/aU3H5n1zNUcX6TM94b3QxOY=
193+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 h1:IUA9nvMmnKWcj5jl84xn+T5MnlZKThmUW1TdblaLVAc=
194+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0/go.mod h1:dDy58f92j70zLsuZVuUX5Wp9vtxXpaZnkPGWeqDfCps=
191195
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
192196
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

‎go.mod‎

Lines changed: 62 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
module github.com/openstack-k8s-operators/ovn-operator
22

3-
go 1.24
3+
go 1.24.4
44

55
require (
66
github.com/go-logr/logr v1.4.3
77
github.com/google/uuid v1.6.0
88
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.7.7
9-
github.com/onsi/ginkgo/v2 v2.20.1
10-
github.com/onsi/gomega v1.34.1
9+
github.com/onsi/ginkgo/v2 v2.23.4
10+
github.com/onsi/gomega v1.38.0
1111
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250922155301-057562fb7182
1212
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
1313
github.com/openstack-k8s-operators/lib-common/modules/test v0.6.1-0.20250922082314-c83d83092a04
1414
github.com/openstack-k8s-operators/ovn-operator/api v0.0.0-20230418071801-b5843d9e05fb
1515
go.uber.org/zap v1.27.0
16-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
17-
k8s.io/api v0.31.12
18-
k8s.io/apimachinery v0.31.12
19-
k8s.io/client-go v0.31.12
16+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
17+
k8s.io/api v0.31.13
18+
k8s.io/apimachinery v0.31.13
19+
k8s.io/client-go v0.31.13
2020
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
2121
sigs.k8s.io/controller-runtime v0.19.7
2222
)
@@ -25,58 +25,61 @@ require (
2525
github.com/beorn7/perks v1.0.1 // indirect
2626
github.com/cespare/xxhash/v2 v2.3.0 // indirect
2727
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
28-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
29-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
30-
github.com/fsnotify/fsnotify v1.7.0 // indirect
31-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
28+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
29+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
30+
github.com/fsnotify/fsnotify v1.9.0 // indirect
31+
github.com/fxamacker/cbor/v2 v2.8.0 // indirect
3232
github.com/go-logr/zapr v1.3.0 // indirect
33-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
33+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
3434
github.com/go-openapi/jsonreference v0.21.0 // indirect
35-
github.com/go-openapi/swag v0.23.0 // indirect
35+
github.com/go-openapi/swag v0.23.1 // indirect
3636
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
3737
github.com/gogo/protobuf v1.3.2 // indirect
3838
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3939
github.com/golang/protobuf v1.5.4 // indirect
40-
github.com/google/gnostic-models v0.6.8 // indirect
41-
github.com/google/go-cmp v0.6.0 // indirect
40+
github.com/google/gnostic-models v0.7.0 // indirect
41+
github.com/google/go-cmp v0.7.0 // indirect
4242
github.com/google/gofuzz v1.2.0 // indirect
43-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
43+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
4444
github.com/imdario/mergo v0.3.16 // indirect
4545
github.com/josharian/intern v1.0.0 // indirect
4646
github.com/json-iterator/go v1.1.12 // indirect
47-
github.com/mailru/easyjson v0.7.7 // indirect
47+
github.com/mailru/easyjson v0.9.0 // indirect
4848
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
4949
github.com/modern-go/reflect2 v1.0.2 // indirect
5050
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
5151
github.com/openshift/api v3.9.0+incompatible // indirect
5252
github.com/pkg/errors v0.9.1 // indirect
53-
github.com/prometheus/client_golang v1.19.1 // indirect
54-
github.com/prometheus/client_model v0.6.1 // indirect
55-
github.com/prometheus/common v0.55.0 // indirect
56-
github.com/prometheus/procfs v0.15.1 // indirect
53+
github.com/prometheus/client_golang v1.22.0 // indirect
54+
github.com/prometheus/client_model v0.6.2 // indirect
55+
github.com/prometheus/common v0.65.0 // indirect
56+
github.com/prometheus/procfs v0.16.1 // indirect
5757
github.com/rabbitmq/cluster-operator/v2 v2.9.0 // indirect
58-
github.com/spf13/pflag v1.0.5 // indirect
58+
github.com/spf13/pflag v1.0.6 // indirect
5959
github.com/x448/float16 v0.8.4 // indirect
60+
go.uber.org/automaxprocs v1.6.0 // indirect
6061
go.uber.org/multierr v1.11.0 // indirect
61-
golang.org/x/mod v0.20.0 // indirect
62-
golang.org/x/net v0.28.0 // indirect
63-
golang.org/x/oauth2 v0.21.0 // indirect
64-
golang.org/x/sys v0.23.0 // indirect
65-
golang.org/x/term v0.23.0 // indirect
66-
golang.org/x/text v0.17.0 // indirect
67-
golang.org/x/time v0.5.0 // indirect
68-
golang.org/x/tools v0.24.0 // indirect
69-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
70-
google.golang.org/protobuf v1.34.2 // indirect
62+
go.yaml.in/yaml/v2 v2.4.2 // indirect
63+
go.yaml.in/yaml/v3 v3.0.3 // indirect
64+
golang.org/x/mod v0.26.0 // indirect
65+
golang.org/x/net v0.42.0 // indirect
66+
golang.org/x/oauth2 v0.30.0 // indirect
67+
golang.org/x/sys v0.34.0 // indirect
68+
golang.org/x/term v0.33.0 // indirect
69+
golang.org/x/text v0.27.0 // indirect
70+
golang.org/x/time v0.12.0 // indirect
71+
golang.org/x/tools v0.34.0 // indirect
72+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
73+
google.golang.org/protobuf v1.36.6 // 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.12 // 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
77-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
78-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
79-
sigs.k8s.io/yaml v1.4.0 // indirect
78+
k8s.io/kube-openapi v0.0.0-20250610211856-8b98d1ed966a // indirect
79+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
80+
sigs.k8s.io/randfill v1.0.0 // indirect
81+
sigs.k8s.io/structured-merge-diff/v4 v4.7.0 // indirect
82+
sigs.k8s.io/yaml v1.5.0 // indirect
8083
)
8184

8285
replace github.com/openstack-k8s-operators/ovn-operator/api => ./api
@@ -85,5 +88,24 @@ replace github.com/openstack-k8s-operators/ovn-operator/api => ./api
8588
// must consistent within modules and service operators
8689
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging
8790

88-
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag)
89-
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
91+
// pin these to avoid later versions pulled by rabbitmq
92+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.13 //allow-merging
93+
94+
replace k8s.io/api => k8s.io/api v0.31.13 //allow-merging
95+
96+
replace k8s.io/apiserver => k8s.io/apiserver v0.31.13 //allow-merging
97+
98+
replace k8s.io/client-go => k8s.io/client-go v0.31.13 //allow-merging
99+
100+
replace k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.31.13 //allow-merging
101+
102+
replace k8s.io/cli-runtime => k8s.io/cli-runtime v0.31.13 //allow-merging
103+
104+
replace k8s.io/code-generator => k8s.io/code-generator v0.31.13 //allow-merging
105+
106+
replace k8s.io/component-base => k8s.io/component-base v0.31.13 //allow-merging
107+
108+
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.16.0_patches)
109+
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec //allow-merging
110+
111+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging

0 commit comments

Comments
 (0)