Skip to content

Commit f39d837

Browse files
committed
Bump to rabbitmq 2.16.1
1 parent 2d8f12d commit f39d837

25 files changed

Lines changed: 863 additions & 656 deletions

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13238,7 +13238,7 @@ spec:
1323813238
rabbitmq:
1323913239
properties:
1324013240
additionalConfig:
13241-
maxLength: 2000
13241+
maxLength: 100000
1324213242
type: string
1324313243
additionalPlugins:
1324413244
items:
@@ -13350,6 +13350,10 @@ spec:
1335013350
- PreferDualStack
1335113351
- RequireDualStack
1335213352
type: string
13353+
labels:
13354+
additionalProperties:
13355+
type: string
13356+
type: object
1335313357
type:
1335413358
default: ClusterIP
1335513359
enum:

apis/go.mod

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

3-
go 1.24
3+
go 1.24.6
4+
5+
toolchain go1.24.7
46

57
require (
6-
github.com/cert-manager/cert-manager v1.14.7
8+
github.com/cert-manager/cert-manager v1.16.2
79
github.com/go-playground/validator/v10 v10.25.0
8-
github.com/onsi/ginkgo/v2 v2.20.1
9-
github.com/onsi/gomega v1.34.1
10+
github.com/onsi/ginkgo/v2 v2.24.0
11+
github.com/onsi/gomega v1.38.0
1012
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250916162815-94a54170a2be
1113
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250916151837-4aab51f61506
1214
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250916093535-a95d6d012ab5
1315
github.com/openstack-k8s-operators/glance-operator/api v0.6.1-0.20250913143437-ca03bf1e106a
1416
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20250916093004-20a0505e2327
1517
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20250911092040-f829125f6046
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250919143843-b81500a16049
18+
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20250925182907-ee9d207b9731
1719
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20250915220807-7ac28d765257
1820
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20250916093250-82a76386143d
1921
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20250922082314-c83d83092a04
@@ -33,29 +35,30 @@ require (
3335
github.com/rhobs/observability-operator v0.3.1 // indirect
3436
go.uber.org/multierr v1.11.0 // indirect
3537
go.uber.org/zap v1.27.0 // indirect
36-
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
37-
golang.org/x/tools v0.24.0 // indirect
38+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
39+
golang.org/x/tools v0.36.0 // indirect
3840
k8s.io/api v0.31.12
39-
k8s.io/apimachinery v0.31.12
41+
k8s.io/apimachinery v0.34.0
4042
k8s.io/client-go v0.31.12
4143
k8s.io/utils v0.0.0-20250820121507-0af2bda4dd1d
4244
sigs.k8s.io/controller-runtime v0.19.7
4345
)
4446

4547
require (
48+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4649
github.com/beorn7/perks v1.0.1 // indirect
4750
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4851
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
49-
github.com/emicklei/go-restful/v3 v3.12.0 // indirect
50-
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
51-
github.com/fsnotify/fsnotify v1.7.0 // indirect
52-
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
52+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
53+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
54+
github.com/fsnotify/fsnotify v1.9.0 // indirect
55+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
5356
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
5457
github.com/go-logr/logr v1.4.3 // indirect
5558
github.com/go-logr/zapr v1.3.0 // indirect
56-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
59+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
5760
github.com/go-openapi/jsonreference v0.21.0 // indirect
58-
github.com/go-openapi/swag v0.23.0 // indirect
61+
github.com/go-openapi/swag v0.23.1 // indirect
5962
github.com/go-playground/locales v0.14.1 // indirect
6063
github.com/go-playground/universal-translator v0.18.1 // indirect
6164
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
@@ -65,60 +68,64 @@ require (
6568
github.com/google/gnostic-models v0.7.0 // indirect
6669
github.com/google/go-cmp v0.7.0 // indirect
6770
github.com/google/gofuzz v1.2.0 // indirect
68-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
71+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
6972
github.com/google/uuid v1.6.0 // indirect
7073
github.com/gophercloud/gophercloud v1.14.1 // indirect
7174
github.com/imdario/mergo v0.3.16 // indirect
7275
github.com/josharian/intern v1.0.0 // indirect
7376
github.com/json-iterator/go v1.1.12 // indirect
7477
github.com/leodido/go-urn v1.4.0 // indirect
75-
github.com/mailru/easyjson v0.7.7 // indirect
78+
github.com/mailru/easyjson v0.9.0 // indirect
7679
github.com/metal3-io/baremetal-operator/apis v0.6.3 // indirect
7780
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
7881
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
79-
github.com/modern-go/reflect2 v1.0.2 // indirect
82+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8083
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8184
github.com/openshift/api v3.9.0+incompatible // indirect
8285
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250823121217-7e1cd2e3dd03 // indirect
8386
github.com/pkg/errors v0.9.1 // indirect
84-
github.com/prometheus/client_golang v1.19.1 // indirect
85-
github.com/prometheus/client_model v0.6.1 // indirect
86-
github.com/prometheus/common v0.55.0 // indirect
87-
github.com/prometheus/procfs v0.15.1 // indirect
88-
github.com/rabbitmq/cluster-operator/v2 v2.9.0 // indirect
87+
github.com/prometheus/client_golang v1.22.0 // indirect
88+
github.com/prometheus/client_model v0.6.2 // indirect
89+
github.com/prometheus/common v0.65.0 // indirect
90+
github.com/prometheus/procfs v0.16.1 // indirect
91+
github.com/rabbitmq/cluster-operator/v2 v2.16.1 // indirect
8992
github.com/robfig/cron/v3 v3.0.1 // indirect
90-
github.com/spf13/pflag v1.0.6 // indirect
93+
github.com/spf13/pflag v1.0.7 // indirect
9194
github.com/stretchr/testify v1.11.1 // indirect
9295
github.com/x448/float16 v0.8.4 // indirect
96+
go.uber.org/automaxprocs v1.6.0 // indirect
9397
go.yaml.in/yaml/v2 v2.4.2 // indirect
94-
go.yaml.in/yaml/v3 v3.0.3 // indirect
95-
golang.org/x/crypto v0.33.0 // indirect
96-
golang.org/x/net v0.34.0 // indirect
97-
golang.org/x/oauth2 v0.21.0 // indirect
98-
golang.org/x/sys v0.30.0 // indirect
99-
golang.org/x/term v0.29.0 // indirect
100-
golang.org/x/text v0.22.0 // indirect
101-
golang.org/x/time v0.5.0 // indirect
102-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
103-
google.golang.org/protobuf v1.35.1 // indirect
98+
go.yaml.in/yaml/v3 v3.0.4 // indirect
99+
golang.org/x/crypto v0.41.0 // indirect
100+
golang.org/x/net v0.43.0 // indirect
101+
golang.org/x/oauth2 v0.30.0 // indirect
102+
golang.org/x/sys v0.35.0 // indirect
103+
golang.org/x/term v0.34.0 // indirect
104+
golang.org/x/text v0.28.0 // indirect
105+
golang.org/x/time v0.12.0 // indirect
106+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
107+
google.golang.org/protobuf v1.36.6 // indirect
104108
gopkg.in/inf.v0 v0.9.1 // indirect
105109
gopkg.in/yaml.v3 v3.0.1 // indirect
106110
k8s.io/apiextensions-apiserver v0.31.12 // indirect
107111
k8s.io/klog/v2 v2.130.1 // indirect
108-
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
109-
sigs.k8s.io/gateway-api v1.0.0 // indirect
110-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
112+
k8s.io/kube-openapi v0.0.0-20250902184714-7fc278399c7f // indirect
113+
sigs.k8s.io/gateway-api v1.2.0 // indirect
114+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
111115
sigs.k8s.io/randfill v1.0.0 // indirect
112116
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
113-
sigs.k8s.io/yaml v1.4.0 // indirect
117+
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
118+
sigs.k8s.io/yaml v1.6.0 // indirect
114119
)
115120

116121
// mschuppert: map to latest commit from release-4.18 tag
117122
// must consistent within modules and service operators
118123
replace github.com/openshift/api => github.com/openshift/api v0.0.0-20250711200046-c86d80652a9e //allow-merging
119124

120-
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag_n)
121-
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
125+
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.16.1_patches)
126+
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250908125410-7d2a19c00133 //allow-merging
122127

123128
// pin to support rabbitmq 2.16.1 rebase
124-
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging
129+
//replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e //allow-merging
130+
131+
replace k8s.io/apimachinery => k8s.io/apimachinery v0.31.12 //allow-merging

0 commit comments

Comments
 (0)