Skip to content

Commit fea8d51

Browse files
committed
Bump to rabbitmq 2.16.1
1 parent ccbd1cf commit fea8d51

26 files changed

Lines changed: 884 additions & 666 deletions

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,7 +313,7 @@ KUSTOMIZE_VERSION ?= v5.5.0 #(dprince: bumped to aquire new features like --load
313313
CONTROLLER_TOOLS_VERSION ?= v0.18.0
314314
CRD_MARKDOWN_VERSION ?= v0.0.3
315315
KUTTL_VERSION ?= 0.17.0
316-
GOTOOLCHAIN_VERSION ?= go1.24.0
316+
GOTOOLCHAIN_VERSION ?= go1.24.6
317317
OC_VERSION ?= 4.16.0
318318

319319
KUSTOMIZE_INSTALL_SCRIPT ?= "https://raw.githubusercontent.com/kubernetes-sigs/kustomize/master/hack/install_kustomize.sh"

apis/bases/core.openstack.org_openstackcontrolplanes.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13229,7 +13229,7 @@ spec:
1322913229
rabbitmq:
1323013230
properties:
1323113231
additionalConfig:
13232-
maxLength: 2000
13232+
maxLength: 100000
1323313233
type: string
1323413234
additionalPlugins:
1323513235
items:
@@ -13341,6 +13341,10 @@ spec:
1334113341
- PreferDualStack
1334213342
- RequireDualStack
1334313343
type: string
13344+
labels:
13345+
additionalProperties:
13346+
type: string
13347+
type: object
1334413348
type:
1334513349
default: ClusterIP
1334613350
enum:

apis/go.mod

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

3-
go 1.24
3+
go 1.24.6
44

55
require (
6-
github.com/cert-manager/cert-manager v1.14.7
6+
github.com/cert-manager/cert-manager v1.16.2
77
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
8+
github.com/onsi/ginkgo/v2 v2.24.0
9+
github.com/onsi/gomega v1.38.0
1010
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20250811081936-b924833273de
1111
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20250811072039-c7a3c10d2a4d
1212
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20250811072040-b2d983cbfb16
@@ -33,8 +33,8 @@ require (
3333
github.com/rhobs/observability-operator v0.3.1 // indirect
3434
go.uber.org/multierr v1.11.0 // indirect
3535
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
36+
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
37+
golang.org/x/tools v0.36.0 // indirect
3838
k8s.io/api v0.31.12
3939
k8s.io/apimachinery v0.31.12
4040
k8s.io/client-go v0.31.12
@@ -43,76 +43,85 @@ require (
4343
)
4444

4545
require (
46+
github.com/Masterminds/semver/v3 v3.3.1 // indirect
4647
github.com/beorn7/perks v1.0.1 // indirect
4748
github.com/cespare/xxhash/v2 v2.3.0 // indirect
4849
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
50+
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
51+
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
52+
github.com/fsnotify/fsnotify v1.9.0 // indirect
53+
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
5354
github.com/gabriel-vasile/mimetype v1.4.8 // indirect
5455
github.com/go-logr/logr v1.4.3 // indirect
5556
github.com/go-logr/zapr v1.3.0 // indirect
56-
github.com/go-openapi/jsonpointer v0.21.0 // indirect
57+
github.com/go-openapi/jsonpointer v0.21.1 // indirect
5758
github.com/go-openapi/jsonreference v0.21.0 // indirect
58-
github.com/go-openapi/swag v0.23.0 // indirect
59+
github.com/go-openapi/swag v0.23.1 // indirect
5960
github.com/go-playground/locales v0.14.1 // indirect
6061
github.com/go-playground/universal-translator v0.18.1 // indirect
6162
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6263
github.com/gogo/protobuf v1.3.2 // indirect
6364
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6465
github.com/golang/protobuf v1.5.4 // indirect
65-
github.com/google/gnostic-models v0.6.9-0.20230804172637-c7be7c783f49 // indirect
66+
github.com/google/gnostic-models v0.7.0 // indirect
6667
github.com/google/go-cmp v0.7.0 // indirect
6768
github.com/google/gofuzz v1.2.0 // indirect
68-
github.com/google/pprof v0.0.0-20240727154555-813a5fbdbec8 // indirect
69+
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
6970
github.com/google/uuid v1.6.0 // indirect
7071
github.com/gophercloud/gophercloud v1.14.1 // indirect
7172
github.com/imdario/mergo v0.3.16 // indirect
7273
github.com/josharian/intern v1.0.0 // indirect
7374
github.com/json-iterator/go v1.1.12 // indirect
7475
github.com/leodido/go-urn v1.4.0 // indirect
75-
github.com/mailru/easyjson v0.7.7 // indirect
76+
github.com/mailru/easyjson v0.9.0 // indirect
7677
github.com/metal3-io/baremetal-operator/apis v0.6.3 // indirect
7778
github.com/metal3-io/baremetal-operator/pkg/hardwareutils v0.5.1 // indirect
7879
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
79-
github.com/modern-go/reflect2 v1.0.2 // indirect
80+
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
8081
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8182
github.com/openshift/api v3.9.0+incompatible // indirect
8283
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.6.1-0.20250730071847-837b07f8d72f // indirect
8384
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
85+
github.com/prometheus/client_golang v1.22.0 // indirect
86+
github.com/prometheus/client_model v0.6.2 // indirect
87+
github.com/prometheus/common v0.65.0 // indirect
88+
github.com/prometheus/procfs v0.16.1 // indirect
8889
github.com/rabbitmq/cluster-operator/v2 v2.9.0 // indirect
8990
github.com/robfig/cron/v3 v3.0.1 // indirect
90-
github.com/spf13/pflag v1.0.6 // indirect
91+
github.com/rogpeppe/go-internal v1.13.1 // indirect
92+
github.com/spf13/pflag v1.0.7 // indirect
9193
github.com/x448/float16 v0.8.4 // indirect
92-
golang.org/x/crypto v0.33.0 // indirect
93-
golang.org/x/net v0.34.0 // indirect
94-
golang.org/x/oauth2 v0.21.0 // indirect
95-
golang.org/x/sys v0.30.0 // indirect
96-
golang.org/x/term v0.29.0 // indirect
97-
golang.org/x/text v0.22.0 // indirect
98-
golang.org/x/time v0.5.0 // indirect
99-
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
100-
google.golang.org/protobuf v1.34.2 // indirect
94+
go.uber.org/automaxprocs v1.6.0 // indirect
95+
go.yaml.in/yaml/v2 v2.4.2 // indirect
96+
go.yaml.in/yaml/v3 v3.0.3 // indirect
97+
golang.org/x/crypto v0.41.0 // indirect
98+
golang.org/x/net v0.43.0 // indirect
99+
golang.org/x/oauth2 v0.30.0 // indirect
100+
golang.org/x/sys v0.35.0 // indirect
101+
golang.org/x/term v0.34.0 // indirect
102+
golang.org/x/text v0.28.0 // indirect
103+
golang.org/x/time v0.12.0 // indirect
104+
gomodules.xyz/jsonpatch/v2 v2.5.0 // indirect
105+
google.golang.org/protobuf v1.36.6 // indirect
101106
gopkg.in/inf.v0 v0.9.1 // indirect
102-
gopkg.in/yaml.v2 v2.4.0 // indirect
103107
gopkg.in/yaml.v3 v3.0.1 // indirect
104108
k8s.io/apiextensions-apiserver v0.31.12 // indirect
105109
k8s.io/klog/v2 v2.130.1 // indirect
106-
k8s.io/kube-openapi v0.0.0-20240322212309-b815d8309940 // indirect
107-
sigs.k8s.io/gateway-api v1.0.0 // indirect
108-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
109-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
110-
sigs.k8s.io/yaml v1.4.0 // indirect
110+
k8s.io/kube-openapi v0.0.0-20250902184714-7fc278399c7f // indirect
111+
sigs.k8s.io/gateway-api v1.2.0 // indirect
112+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
113+
sigs.k8s.io/randfill v1.0.0 // indirect
114+
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
115+
sigs.k8s.io/yaml v1.6.0 // indirect
111116
)
112117

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

117-
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.9.0_patches_tag_n)
118-
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250717122149-12f70b7f3d8d //allow-merging
122+
// custom RabbitmqClusterSpecCore for OpenStackControlplane (v2.16.1_patches)
123+
replace github.com/rabbitmq/cluster-operator/v2 => github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250908125410-7d2a19c00133
124+
125+
replace k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20250627150254-e9823e99808e
126+
127+
replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/dprince/infra-operator/apis v0.0.0-20250908131059-3925e107864b

0 commit comments

Comments
 (0)