Skip to content

Commit 7edf581

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #679 from dprince/rabbit_v2.6.0
Bump to rabbitmq v2.6.0 structs, also new bundle
2 parents 28cd696 + 01a59c3 commit 7edf581

File tree

7 files changed

+32
-13
lines changed

7 files changed

+32
-13
lines changed

‎apis/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15160,6 +15160,9 @@ spec:
1516015160
envConfig:
1516115161
maxLength: 100000
1516215162
type: string
15163+
erlangInetConfig:
15164+
maxLength: 2000
15165+
type: string
1516315166
type: object
1516415167
replicas:
1516515168
default: 1
@@ -15245,6 +15248,12 @@ spec:
1524515248
additionalProperties:
1524615249
type: string
1524715250
type: object
15251+
ipFamilyPolicy:
15252+
enum:
15253+
- SingleStack
15254+
- PreferDualStack
15255+
- RequireDualStack
15256+
type: string
1524815257
type:
1524915258
default: ClusterIP
1525015259
enum:

‎apis/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ require (
2424
github.com/openstack-k8s-operators/placement-operator/api v0.3.1-0.20240229134606-d2a5a5abde9d
2525
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240301170116-13941759ec79
2626
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240301135657-444ba309cbb5
27-
github.com/rabbitmq/cluster-operator/v2 v2.5.0
27+
github.com/rabbitmq/cluster-operator/v2 v2.6.0
2828
k8s.io/apimachinery v0.29.0
2929
sigs.k8s.io/controller-runtime v0.16.5
3030
)
@@ -34,7 +34,7 @@ require (
3434
github.com/go-logr/zapr v1.3.0 // indirect
3535
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
3636
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
37-
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
37+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
3838
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
3939
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3 // indirect
4040
github.com/rhobs/observability-operator v0.0.20 // indirect

‎apis/go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
4343
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
4444
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
4545
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
46-
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 h1:2XF1Vzq06X+inNqgJ9tRnGuw+ZVCB3FazXODD6JE1R8=
47-
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
46+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ=
47+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
4848
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
4949
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
5050
github.com/gophercloud/gophercloud v1.9.0 h1:zKvmHOmHuaZlnx9d2DJpEgbMxrGt/+CJ/bKOKQh9Xzo=
@@ -129,8 +129,8 @@ github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqSc
129129
github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ=
130130
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
131131
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
132-
github.com/rabbitmq/cluster-operator/v2 v2.5.0 h1:eaGRv735A06onSnGhbjr1qeASrOAIe4YT8lypWno+I8=
133-
github.com/rabbitmq/cluster-operator/v2 v2.5.0/go.mod h1:XD5mUEfmpMQwLhAku0gEzHHM5/Uf3/Vk1cpwECI1FYY=
132+
github.com/rabbitmq/cluster-operator/v2 v2.6.0 h1:pr42elurQgi4DVmLTI1cOh8VZRNkfFKZK9+FgQuM/8w=
133+
github.com/rabbitmq/cluster-operator/v2 v2.6.0/go.mod h1:Zryxg5YgbPUFcLSCcKpf10il8kIRAK5HloNo6khhdis=
134134
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3 h1:vy4ElN2RHyrIzzPn5b8vKuQLg4ZofuUAz65eLqLqloA=
135135
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3/go.mod h1:p+YsgXodntOtgwXKTpWrJzVS7QmMfZlGDG0v6Noze7s=
136136
github.com/rhobs/observability-operator v0.0.20 h1:u4Ejzq/Yt3rY4b/apKhpgYIvmp+MpcV9hhEzhzedpk4=

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15160,6 +15160,9 @@ spec:
1516015160
envConfig:
1516115161
maxLength: 100000
1516215162
type: string
15163+
erlangInetConfig:
15164+
maxLength: 2000
15165+
type: string
1516315166
type: object
1516415167
replicas:
1516515168
default: 1
@@ -15245,6 +15248,12 @@ spec:
1524515248
additionalProperties:
1524615249
type: string
1524715250
type: object
15251+
ipFamilyPolicy:
15252+
enum:
15253+
- SingleStack
15254+
- PreferDualStack
15255+
- RequireDualStack
15256+
type: string
1524815257
type:
1524915258
default: ClusterIP
1525015259
enum:

‎go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ require (
3535
github.com/openstack-k8s-operators/swift-operator/api v0.3.1-0.20240301170116-13941759ec79
3636
github.com/openstack-k8s-operators/telemetry-operator/api v0.3.1-0.20240301135657-444ba309cbb5
3737
github.com/operator-framework/api v0.20.0
38-
github.com/rabbitmq/cluster-operator/v2 v2.5.0
38+
github.com/rabbitmq/cluster-operator/v2 v2.6.0
3939
go.uber.org/zap v1.27.0
4040
golang.org/x/exp v0.0.0-20240213143201-ec583247a57a
4141
k8s.io/api v0.29.0
@@ -48,7 +48,7 @@ require (
4848
github.com/go-logr/zapr v1.3.0 // indirect
4949
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
5050
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
51-
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 // indirect
51+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 // indirect
5252
github.com/k8snetworkplumbingwg/network-attachment-definition-client v1.4.0 // indirect
5353
github.com/metal3-io/baremetal-operator/apis v0.5.0 // indirect
5454
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.4.0 // indirect

‎go.sum‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeN
4848
github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
4949
github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
5050
github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
51-
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3 h1:2XF1Vzq06X+inNqgJ9tRnGuw+ZVCB3FazXODD6JE1R8=
52-
github.com/google/pprof v0.0.0-20230510103437-eeec1cb781c3/go.mod h1:79YE0hCXdHag9sBkw2o+N/YnZtTkXi0UT9Nnixa5eYk=
51+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98 h1:pUa4ghanp6q4IJHwE9RwLgmVFfReJN+KbQ8ExNEUUoQ=
52+
github.com/google/pprof v0.0.0-20230926050212-f7f687d19a98/go.mod h1:czg5+yv1E0ZGTi6S6vVK1mke0fV+FaUhNGcd6VRS9Ik=
5353
github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
5454
github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
5555
github.com/gophercloud/gophercloud v1.9.0 h1:zKvmHOmHuaZlnx9d2DJpEgbMxrGt/+CJ/bKOKQh9Xzo=
@@ -151,8 +151,8 @@ github.com/prometheus/common v0.46.0 h1:doXzt5ybi1HBKpsZOL0sSkaNHJJqkyfEWZGGqqSc
151151
github.com/prometheus/common v0.46.0/go.mod h1:Tp0qkxpb9Jsg54QMe+EAmqXkSV7Evdy1BTn+g2pa/hQ=
152152
github.com/prometheus/procfs v0.12.0 h1:jluTpSng7V9hY0O2R9DzzJHYb2xULk9VTR1V1R/k6Bo=
153153
github.com/prometheus/procfs v0.12.0/go.mod h1:pcuDEFsWDnvcgNzo4EEweacyhjeA9Zk3cnaOZAZEfOo=
154-
github.com/rabbitmq/cluster-operator/v2 v2.5.0 h1:eaGRv735A06onSnGhbjr1qeASrOAIe4YT8lypWno+I8=
155-
github.com/rabbitmq/cluster-operator/v2 v2.5.0/go.mod h1:XD5mUEfmpMQwLhAku0gEzHHM5/Uf3/Vk1cpwECI1FYY=
154+
github.com/rabbitmq/cluster-operator/v2 v2.6.0 h1:pr42elurQgi4DVmLTI1cOh8VZRNkfFKZK9+FgQuM/8w=
155+
github.com/rabbitmq/cluster-operator/v2 v2.6.0/go.mod h1:Zryxg5YgbPUFcLSCcKpf10il8kIRAK5HloNo6khhdis=
156156
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3 h1:vy4ElN2RHyrIzzPn5b8vKuQLg4ZofuUAz65eLqLqloA=
157157
github.com/rhobs/obo-prometheus-operator/pkg/apis/monitoring v0.64.1-rhobs3/go.mod h1:p+YsgXodntOtgwXKTpWrJzVS7QmMfZlGDG0v6Noze7s=
158158
github.com/rhobs/observability-operator v0.0.20 h1:u4Ejzq/Yt3rY4b/apKhpgYIvmp+MpcV9hhEzhzedpk4=

‎hack/pin-bundle-images.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,5 +86,6 @@ for MOD_PATH in $(go list -mod=readonly -m -json all | jq -r '. | select(.Path |
8686
done
8787
# append the rabbitmq URL only if we aren't in Dockerfile mode
8888
if [ -z "$DOCKERFILE" ]; then
89-
echo -n ",quay.io/openstack-k8s-operators/rabbitmq-cluster-operator-bundle@sha256:2a09973faa91ae6d3913d61cc0ae7e124240c27f886563de87a2fbdd3aec6ad0"
89+
# pin rabbit to sha256 for the e2d413c102bc73d4b5e186d1d1b1f9bf728701e1 tag (v2.6.0)
90+
echo -n ",quay.io/openstack-k8s-operators/rabbitmq-cluster-operator-bundle@sha256:b3e37b529e76faf5b140021b3e5fd9ba5ef8cfa7c26e74845cf47d075e204906"
9091
fi

0 commit comments

Comments
 (0)