Skip to content

Commit 3266115

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #214 from stuggi/rabbitmq_replace
Update rabbitmq to v2.6.x and allign with openstack-operator
2 parents 88c5f83 + a102987 commit 3266115

8 files changed

Lines changed: 54 additions & 59 deletions

File tree

‎apis/go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,19 @@ require (
2323
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
2424
github.com/fsnotify/fsnotify v1.6.0 // indirect
2525
github.com/go-logr/zapr v1.2.4 // indirect
26-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
26+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
2727
github.com/go-openapi/jsonreference v0.20.2 // indirect
28-
github.com/go-openapi/swag v0.22.3 // indirect
28+
github.com/go-openapi/swag v0.22.4 // indirect
2929
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3030
github.com/gogo/protobuf v1.3.2 // indirect
3131
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3232
github.com/golang/protobuf v1.5.4 // indirect
3333
github.com/google/gnostic-models v0.6.8 // indirect
3434
github.com/google/go-cmp v0.6.0 // indirect
3535
github.com/google/gofuzz v1.2.0 // indirect
36-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
36+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
3737
github.com/google/uuid v1.6.0 // indirect
38-
github.com/imdario/mergo v0.3.12 // indirect
38+
github.com/imdario/mergo v0.3.16 // indirect
3939
github.com/josharian/intern v1.0.0 // indirect
4040
github.com/json-iterator/go v1.1.12 // indirect
4141
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0 // indirect
@@ -69,7 +69,7 @@ require (
6969
k8s.io/apiextensions-apiserver v0.28.9 // indirect
7070
k8s.io/component-base v0.28.9 // indirect
7171
k8s.io/klog/v2 v2.110.1 // indirect
72-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
72+
k8s.io/kube-openapi v0.0.0-20230816210353-14e408962443 // indirect
7373
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7474
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7575
sigs.k8s.io/yaml v1.4.0 // indirect

‎apis/go.sum‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,6 @@ github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
33
github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw=
44
github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44=
55
github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
6-
github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI=
7-
github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5PlCu98SY8svDHJxuZscDgtXS6KTTbou5AhLI=
8-
github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU=
96
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
107
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
118
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -23,12 +20,14 @@ github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
2320
github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
2421
github.com/go-logr/zapr v1.2.4 h1:QHVo+6stLbfJmYGkQ7uGHUCu5hnAFAj6mDe6Ea0SeOo=
2522
github.com/go-logr/zapr v1.2.4/go.mod h1:FyHWQIzQORZ0QVE1BtVHv3cKtNLuXsbNLtpuhNapBOA=
26-
github.com/go-openapi/jsonpointer v0.19.6 h1:eCs3fxoIi3Wh6vtgmLTOjdhSpiqphQ+DaPn38N2ZdrE=
2723
github.com/go-openapi/jsonpointer v0.19.6/go.mod h1:osyAmYz/mB/C3I+WsTTSgw1ONzaLJoLCyoi6/zppojs=
24+
github.com/go-openapi/jsonpointer v0.20.0 h1:ESKJdU9ASRfaPNOPRx12IUyA1vn3R9GiE3KYD14BXdQ=
25+
github.com/go-openapi/jsonpointer v0.20.0/go.mod h1:6PGzBjjIIumbLYysB73Klnms1mwnU4G3YHOECG3CedA=
2826
github.com/go-openapi/jsonreference v0.20.2 h1:3sVjiK66+uXK/6oQ8xgcRKcFgQ5KXa2KvnJRumpMGbE=
2927
github.com/go-openapi/jsonreference v0.20.2/go.mod h1:Bl1zwGIM8/wsvqjsOQLJ/SH+En5Ap4rVB5KVcIDZG2k=
30-
github.com/go-openapi/swag v0.22.3 h1:yMBqmnQ0gyZvEb/+KzuWZOXgllrXT4SADYbvDaXHv/g=
3128
github.com/go-openapi/swag v0.22.3/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
29+
github.com/go-openapi/swag v0.22.4 h1:QLMzNJnMGPRNDCbySlcj1x01tzU8/9LTTL9hZZZogBU=
30+
github.com/go-openapi/swag v0.22.4/go.mod h1:UzaqsxGiab7freDnrUUra0MwWfN/q7tE4j+VcZ0yl14=
3231
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
3332
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572/go.mod h1:9Pwr4B2jHnOSGXyyzV8ROjYa2ojvAY6HCGYYfMoC3Ls=
3433
github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
@@ -47,13 +46,12 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
4746
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
4847
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
4948
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
50-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 h1:K6RDEckDVWvDI9JAJYCmNdQXq6neHJOYx3V6jnqNEec=
51-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
49+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ=
50+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
5251
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
5352
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
54-
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
55-
github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU=
56-
github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA=
53+
github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
54+
github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
5755
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
5856
github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8HmY=
5957
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
@@ -114,7 +112,7 @@ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
114112
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
115113
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
116114
github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
117-
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
115+
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
118116
github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
119117
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
120118
github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
@@ -151,7 +149,6 @@ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJ
151149
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
152150
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
153151
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
154-
golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
155152
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
156153
golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
157154
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
@@ -197,7 +194,6 @@ gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EV
197194
gopkg.in/inf.v0 v0.9.1 h1:73M5CoZyi3ZLMOyDlQh031Cx6N9NDJ2Vvfl76EDAgDc=
198195
gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw=
199196
gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
200-
gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
201197
gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
202198
gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
203199
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
@@ -215,8 +211,8 @@ k8s.io/component-base v0.28.9 h1:ySM2PR8Z/xaUSG1Akd3yM6dqUezTltI7S5aV41MMuuc=
215211
k8s.io/component-base v0.28.9/go.mod h1:QtWzscEhCKRfHV24/S+11BwWjVxhC6fd3RYoEgZcWFU=
216212
k8s.io/klog/v2 v2.110.1 h1:U/Af64HJf7FcwMcXyKm2RPM22WZzyR7OSpYj5tg3cL0=
217213
k8s.io/klog/v2 v2.110.1/go.mod h1:YGtd1984u+GgbuZ7e08/yBuAfKLSO0+uR1Fhi6ExXjo=
218-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 h1:LyMgNKD2P8Wn1iAwQU5OhxCKlKJy0sHc+PcDwFB24dQ=
219-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
214+
k8s.io/kube-openapi v0.0.0-20230816210353-14e408962443 h1:CAIciCnJnSOQxPd0xvpV6JU3D4AJvnYbImPpFpO9Hnw=
215+
k8s.io/kube-openapi v0.0.0-20230816210353-14e408962443/go.mod h1:wZK2AVp1uHCp4VamDVgBP2COHZjqD1T68Rf0CM3YjSM=
220216
k8s.io/utils v0.0.0-20240310230437-4693a0247e57 h1:gbqbevonBh57eILzModw6mrkbwM0gQBEuevE/AaBsHY=
221217
k8s.io/utils v0.0.0-20240310230437-4693a0247e57/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
222218
sigs.k8s.io/controller-runtime v0.16.5 h1:yr1cEJbX08xsTW6XEIzT13KHHmIyX8Umvme2cULvFZw=

‎controllers/rabbitmq/transporturl_controller.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
3939
helper "github.com/openstack-k8s-operators/lib-common/modules/common/helper"
4040
oko_secret "github.com/openstack-k8s-operators/lib-common/modules/common/secret"
41-
rabbitmqclusterv1 "github.com/rabbitmq/cluster-operator/api/v1beta1"
41+
rabbitmqclusterv2 "github.com/rabbitmq/cluster-operator/v2/api/v1beta1"
4242
k8s_errors "k8s.io/apimachinery/pkg/api/errors"
4343
"k8s.io/apimachinery/pkg/types"
4444
"k8s.io/client-go/kubernetes"
@@ -360,7 +360,7 @@ func (r *TransportURLReconciler) SetupWithManager(mgr ctrl.Manager) error {
360360
For(&rabbitmqv1.TransportURL{}).
361361
Owns(&corev1.Secret{}).
362362
Watches(
363-
&rabbitmqclusterv1.RabbitmqCluster{},
363+
&rabbitmqclusterv2.RabbitmqCluster{},
364364
handler.EnqueueRequestsFromMapFunc(r.findObjectsForSrc),
365365
builder.WithPredicates(predicate.ResourceVersionChangedPredicate{}),
366366
).
@@ -401,8 +401,8 @@ func getRabbitmqCluster(
401401
ctx context.Context,
402402
h *helper.Helper,
403403
instance *rabbitmqv1.TransportURL,
404-
) (*rabbitmqclusterv1.RabbitmqCluster, error) {
405-
rabbitMqCluster := &rabbitmqclusterv1.RabbitmqCluster{}
404+
) (*rabbitmqclusterv2.RabbitmqCluster, error) {
405+
rabbitMqCluster := &rabbitmqclusterv2.RabbitmqCluster{}
406406

407407
err := h.GetClient().Get(ctx, types.NamespacedName{Name: instance.Spec.RabbitmqClusterName, Namespace: instance.Namespace}, rabbitMqCluster)
408408

‎go.mod‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ require (
1010
github.com/openstack-k8s-operators/infra-operator/apis v0.3.0
1111
github.com/openstack-k8s-operators/lib-common/modules/common v0.3.1-0.20240412091425-bb628ded5eb8
1212
github.com/openstack-k8s-operators/lib-common/modules/test v0.3.1-0.20240412091425-bb628ded5eb8
13-
github.com/rabbitmq/cluster-operator v1.14.0
13+
github.com/rabbitmq/cluster-operator/v2 v2.6.0
1414
go.uber.org/zap v1.27.0
1515
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
1616
k8s.io/api v0.28.9
@@ -28,18 +28,18 @@ require (
2828
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
2929
github.com/fsnotify/fsnotify v1.6.0 // indirect
3030
github.com/go-logr/zapr v1.2.4 // indirect
31-
github.com/go-openapi/jsonpointer v0.19.6 // indirect
31+
github.com/go-openapi/jsonpointer v0.20.0 // indirect
3232
github.com/go-openapi/jsonreference v0.20.2 // indirect
33-
github.com/go-openapi/swag v0.22.3 // indirect
33+
github.com/go-openapi/swag v0.22.4 // indirect
3434
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3535
github.com/gogo/protobuf v1.3.2 // indirect
3636
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
3737
github.com/golang/protobuf v1.5.4 // indirect
3838
github.com/google/gnostic-models v0.6.8 // indirect
3939
github.com/google/go-cmp v0.6.0 // indirect
4040
github.com/google/gofuzz v1.2.0 // indirect
41-
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
42-
github.com/imdario/mergo v0.3.12 // indirect
41+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
42+
github.com/imdario/mergo v0.3.16 // indirect
4343
github.com/josharian/intern v1.0.0 // indirect
4444
github.com/json-iterator/go v1.1.12 // indirect
4545
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0 // indirect
@@ -73,7 +73,7 @@ require (
7373
k8s.io/apiextensions-apiserver v0.28.9 // indirect
7474
k8s.io/component-base v0.28.9 // indirect
7575
k8s.io/klog/v2 v2.110.1 // indirect
76-
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
76+
k8s.io/kube-openapi v0.0.0-20230816210353-14e408962443 // indirect
7777
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
7878
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
7979
sigs.k8s.io/yaml v1.4.0 // indirect
@@ -87,3 +87,6 @@ replace github.com/openstack-k8s-operators/infra-operator/apis => ./apis
8787
// mschuppert: map to latest commit from release-4.13 tag
8888
// must consistent within modules and service operators
8989
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20230414143018-3367bc7e6ac7 //allow-merging
90+
91+
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.6.0_patches_tag)
92+
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20240313124519-961a0ee8bf7f //allow-merging

0 commit comments

Comments
 (0)