Skip to content

Commit df78a57

Browse files
lmicciniclaude
lmiccini
and
claude
committed
Drop rabbitmq-cluster-operator and add rabbitmq version label
Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 36856d2 commit df78a57

41 files changed

Lines changed: 473 additions & 5992 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Makefile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,6 @@ bindata: kustomize yq ## Call sync bindata script
166166
sed -i bindata/operator/operator.yaml -e "/customRequests/c\\ cpu: {{ .OpenStackOperator.Deployment.Manager.Resources.Requests.CPU }}\n memory: {{ .OpenStackOperator.Deployment.Manager.Resources.Requests.Memory }}"
167167
sed -i bindata/operator/operator.yaml -e "/customTolerations/c\\ tolerations:\n{{- range .OpenStackOperator.Deployment.Tolerations }}\n - key: \"{{ .Key }}\"\n{{- if .Operator }}\n operator: \"{{ .Operator }}\"\n{{- end }}\n{{- if .Value }}\n value: \"{{ .Value }}\"\n{{- end }}\n{{- if .Effect }}\n effect: \"{{ .Effect }}\"\n{{- end }}\n{{- if .TolerationSeconds }}\n tolerationSeconds: {{ .TolerationSeconds }}\n{{- end }}\n{{- end }}"
168168
cp config/operator/managers.yaml bindata/operator/
169-
cp config/operator/rabbit.yaml bindata/operator/
170169
$(KUSTOMIZE) build config/rbac > bindata/rbac/rbac.yaml
171170
/bin/bash hack/sync-bindata.sh
172171

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

Lines changed: 34 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14138,10 +14138,25 @@ spec:
1413814138
x-kubernetes-list-type: atomic
1413914139
type: object
1414014140
type: object
14141+
config:
14142+
properties:
14143+
additionalConfig:
14144+
type: string
14145+
additionalPlugins:
14146+
items:
14147+
type: string
14148+
type: array
14149+
x-kubernetes-list-type: atomic
14150+
advancedConfig:
14151+
type: string
14152+
envConfig:
14153+
type: string
14154+
erlangInetConfig:
14155+
type: string
14156+
type: object
1414114157
delayStartSeconds:
1414214158
default: 30
1414314159
format: int32
14144-
minimum: 0
1414514160
type: integer
1414614161
nodeSelector:
1414714162
additionalProperties:
@@ -14260,9 +14275,8 @@ spec:
1426014275
type: object
1426114276
x-kubernetes-preserve-unknown-fields: true
1426214277
type: object
14278+
x-kubernetes-preserve-unknown-fields: true
1426314279
persistence:
14264-
default:
14265-
storage: 10Gi
1426614280
properties:
1426714281
storage:
1426814282
anyOf:
@@ -14330,23 +14344,16 @@ spec:
1433014344
rabbitmq:
1433114345
properties:
1433214346
additionalConfig:
14333-
maxLength: 100000
1433414347
type: string
1433514348
additionalPlugins:
1433614349
items:
14337-
maxLength: 100
14338-
pattern: ^\w+$
1433914350
type: string
14340-
maxItems: 100
1434114351
type: array
1434214352
advancedConfig:
14343-
maxLength: 100000
1434414353
type: string
1434514354
envConfig:
14346-
maxLength: 100000
1434714355
type: string
1434814356
erlangInetConfig:
14349-
maxLength: 2000
1435014357
type: string
1435114358
type: object
1435214359
replicas:
@@ -14437,27 +14444,33 @@ spec:
1443714444
type: string
1443814445
type: object
1443914446
ipFamilyPolicy:
14440-
enum:
14441-
- SingleStack
14442-
- PreferDualStack
14443-
- RequireDualStack
1444414447
type: string
1444514448
labels:
1444614449
additionalProperties:
1444714450
type: string
1444814451
type: object
1444914452
type:
14450-
default: ClusterIP
14451-
enum:
14452-
- ClusterIP
14453-
- LoadBalancer
14454-
- NodePort
1445514453
type: string
1445614454
type: object
1445714455
skipPostDeploySteps:
1445814456
type: boolean
14457+
storage:
14458+
properties:
14459+
storage:
14460+
anyOf:
14461+
- type: integer
14462+
- type: string
14463+
default: 10Gi
14464+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
14465+
x-kubernetes-int-or-string: true
14466+
storageClassName:
14467+
type: string
14468+
type: object
14469+
targetVersion:
14470+
pattern: ^\d+\.\d+(\.\d+)?$
14471+
type: string
1445914472
terminationGracePeriodSeconds:
14460-
default: 604800
14473+
default: 60
1446114474
format: int64
1446214475
minimum: 0
1446314476
type: integer
@@ -14486,6 +14499,7 @@ spec:
1448614499
type: string
1448714500
type: object
1448814501
type: array
14502+
x-kubernetes-list-type: atomic
1448914503
topologyRef:
1449014504
properties:
1449114505
name:

‎api/bases/core.openstack.org_openstackversions.yaml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -250,6 +250,8 @@ spec:
250250
properties:
251251
glanceWsgi:
252252
type: string
253+
rabbitmqVersion:
254+
type: string
253255
type: object
254256
type: object
255257
availableVersion:
@@ -685,6 +687,8 @@ spec:
685687
properties:
686688
glanceWsgi:
687689
type: string
690+
rabbitmqVersion:
691+
type: string
688692
type: object
689693
trackedCustomImages:
690694
additionalProperties:

‎api/bases/operator.openstack.org_openstacks.yaml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,6 @@ spec:
141141
- openstack-baremetal
142142
- ovn
143143
- placement
144-
- rabbitmq-cluster
145144
- swift
146145
- telemetry
147146
- test

‎api/core/v1beta1/openstackversion_types.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,8 @@ type ContainerTemplate struct {
177177
// ServiceDefaults - struct that contains defaults for OSP services that can change over time
178178
// but are associated with a specific OpenStack release version
179179
type ServiceDefaults struct {
180-
GlanceWsgi *string `json:"glanceWsgi,omitempty"`
180+
GlanceWsgi *string `json:"glanceWsgi,omitempty"`
181+
RabbitmqVersion *string `json:"rabbitmqVersion,omitempty"`
181182
}
182183

183184
// OpenStackVersionStatus defines the observed state of OpenStackVersion

‎api/core/v1beta1/zz_generated.deepcopy.go‎

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎api/go.mod‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ require (
8686
github.com/prometheus/client_model v0.6.2 // indirect
8787
github.com/prometheus/common v0.65.0 // indirect
8888
github.com/prometheus/procfs v0.16.1 // indirect
89-
github.com/rabbitmq/cluster-operator/v2 v2.16.0 // indirect
9089
github.com/robfig/cron/v3 v3.0.1 // indirect
9190
github.com/spf13/pflag v1.0.9 // indirect
9291
github.com/x448/float16 v0.8.4 // indirect
@@ -143,3 +142,5 @@ replace k8s.io/code-generator => k8s.io/code-generator v0.31.14 //allow-merging
143142
replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
144143

145144
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
145+
146+
replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/lmiccini/infra-operator/apis v0.0.0-20260320164938-2057972ad9de

‎api/go.sum‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
9090
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
9191
github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ=
9292
github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI=
93+
github.com/lmiccini/infra-operator/apis v0.0.0-20260320164938-2057972ad9de h1:kapZ0xUDC+MrtXXLmqvuWQg5nxuFNoxM/EfhXhsxdnY=
94+
github.com/lmiccini/infra-operator/apis v0.0.0-20260320164938-2057972ad9de/go.mod h1:QXzR9220I2d7CcoHqL4HWtU1PogJSN3NLmnh+bK3mco=
9395
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
9496
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
9597
github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=
@@ -126,8 +128,6 @@ github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260314075609-1b8
126128
github.com/openstack-k8s-operators/heat-operator/api v0.6.1-0.20260314075609-1b85a36fcef9/go.mod h1:8o0wLkMYyDDqZAdvU/YKMwgwiOyQzADWrmy38rZcHyE=
127129
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260314075038-6794e497bcfc h1:3r2wVspdAWx4j7ZScrukfLiPcGM7J9S/ClyOHsbY7ro=
128130
github.com/openstack-k8s-operators/horizon-operator/api v0.6.1-0.20260314075038-6794e497bcfc/go.mod h1:P0hUdNDsv8ISnK2GyFogNQF+dxatbKhtQ76UKhX6t7w=
129-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260314122830-5d1715fa2f64 h1:1orzxWFuQH+QarnH32GXtc4GbE0efL4NddSsRFx3QYM=
130-
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260314122830-5d1715fa2f64/go.mod h1:nC/Jf3OYJRML8UEzJ/mn/TQcSCv/nhqO6x6LGkdDt60=
131131
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260314080422-d98151f45e34 h1:UgaEid1bqgUzsLg21BHtXSYOV2pljxR1Z3i1BcRVNQc=
132132
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260314080422-d98151f45e34/go.mod h1:xEHdAz96FYfnBb1QAFgbfR2BCWCBIqhqKYT84IqU6zc=
133133
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260314080138-b41734470581 h1:FntUoWPVWx8xaGCwP7kdUVT/N8Z0kfIxLLK4L+oQJ7c=
@@ -154,8 +154,6 @@ github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260314104343-4225
154154
github.com/openstack-k8s-operators/ovn-operator/api v0.6.1-0.20260314104343-4225d7a41ec7/go.mod h1:PxLz6iV8Z3Ql2QDylxLiljfoisGptsUVWEvbcXC8I3o=
155155
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260314091105-4ba8bc4c4955 h1:5LJ5YAEGNRZh5hVolC23bzViQoaT1P0MgRQu9xc7RRU=
156156
github.com/openstack-k8s-operators/placement-operator/api v0.6.1-0.20260314091105-4ba8bc4c4955/go.mod h1:+8lsJYJYsR8fBvgY4Wtvde4iY+l9O5PBPf6yhVQ1LQU=
157-
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec h1:saovr368HPAKHN0aRPh8h8n9s9dn3d8Frmfua0UYRlc=
158-
github.com/openstack-k8s-operators/rabbitmq-cluster-operator/v2 v2.6.1-0.20250929174222-a0d328fa4dec/go.mod h1:Nh2NEePLjovUQof2krTAg4JaAoLacqtPTZQXK6izNfg=
159157
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260314085148-07c5c7f39186 h1:2uSOOWJJXomiSegRgMrhbOcUQsyxEV+m7OJP4pXlCE0=
160158
github.com/openstack-k8s-operators/swift-operator/api v0.6.1-0.20260314085148-07c5c7f39186/go.mod h1:kOdVr5xAw1jdwYJ8P9yKaqc+qbEzKhuxvOQdPfelPdg=
161159
github.com/openstack-k8s-operators/telemetry-operator/api v0.6.1-0.20260314104344-15c2ffcfe08e h1:mjuYX0PJjdZCuXzq+S4VLmZcAZ6BgcQLm7WB1DSfd14=

‎api/operator/v1beta1/openstack_types.go‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ const (
4444
OpenStackBaremetalOperatorName = "openstack-baremetal"
4545
OvnOperatorName = "ovn"
4646
PlacementOperatorName = "placement"
47-
RabbitMQOperatorName = "rabbitmq-cluster"
4847
SwiftOperatorName = "swift"
4948
TelemetryOperatorName = "telemetry"
5049
TestOperatorName = "test"
@@ -161,21 +160,6 @@ var (
161160
{
162161
Name: PlacementOperatorName,
163162
},
164-
{
165-
Name: RabbitMQOperatorName,
166-
ControllerManager: ContainerSpec{
167-
Resources: corev1.ResourceRequirements{
168-
Requests: corev1.ResourceList{
169-
corev1.ResourceCPU: resource.MustParse("5m"),
170-
corev1.ResourceMemory: resource.MustParse("64Mi"),
171-
},
172-
Limits: corev1.ResourceList{
173-
corev1.ResourceCPU: resource.MustParse("200m"),
174-
corev1.ResourceMemory: resource.MustParse("500Mi"),
175-
},
176-
},
177-
},
178-
},
179163
{
180164
Name: SwiftOperatorName,
181165
},
@@ -204,7 +188,7 @@ type OpenStackSpec struct {
204188
type OperatorSpec struct {
205189
// +kubebuilder:validation:Required
206190
// +kubebuilder:validation:MinLength=1
207-
// +kubebuilder:validation:Enum:=openstack;barbican;cinder;designate;glance;heat;horizon;infra;ironic;keystone;manila;mariadb;neutron;nova;octavia;openstack-baremetal;ovn;placement;rabbitmq-cluster;swift;telemetry;test;watcher
191+
// +kubebuilder:validation:Enum:=openstack;barbican;cinder;designate;glance;heat;horizon;infra;ironic;keystone;manila;mariadb;neutron;nova;octavia;openstack-baremetal;ovn;placement;swift;telemetry;test;watcher
208192
// Name of the service operators.
209193
Name string `json:"name"`
210194

‎bindata/crds/crds.yaml‎

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -14403,10 +14403,25 @@ spec:
1440314403
x-kubernetes-list-type: atomic
1440414404
type: object
1440514405
type: object
14406+
config:
14407+
properties:
14408+
additionalConfig:
14409+
type: string
14410+
additionalPlugins:
14411+
items:
14412+
type: string
14413+
type: array
14414+
x-kubernetes-list-type: atomic
14415+
advancedConfig:
14416+
type: string
14417+
envConfig:
14418+
type: string
14419+
erlangInetConfig:
14420+
type: string
14421+
type: object
1440614422
delayStartSeconds:
1440714423
default: 30
1440814424
format: int32
14409-
minimum: 0
1441014425
type: integer
1441114426
nodeSelector:
1441214427
additionalProperties:
@@ -14525,9 +14540,8 @@ spec:
1452514540
type: object
1452614541
x-kubernetes-preserve-unknown-fields: true
1452714542
type: object
14543+
x-kubernetes-preserve-unknown-fields: true
1452814544
persistence:
14529-
default:
14530-
storage: 10Gi
1453114545
properties:
1453214546
storage:
1453314547
anyOf:
@@ -14595,23 +14609,16 @@ spec:
1459514609
rabbitmq:
1459614610
properties:
1459714611
additionalConfig:
14598-
maxLength: 100000
1459914612
type: string
1460014613
additionalPlugins:
1460114614
items:
14602-
maxLength: 100
14603-
pattern: ^\w+$
1460414615
type: string
14605-
maxItems: 100
1460614616
type: array
1460714617
advancedConfig:
14608-
maxLength: 100000
1460914618
type: string
1461014619
envConfig:
14611-
maxLength: 100000
1461214620
type: string
1461314621
erlangInetConfig:
14614-
maxLength: 2000
1461514622
type: string
1461614623
type: object
1461714624
replicas:
@@ -14702,27 +14709,33 @@ spec:
1470214709
type: string
1470314710
type: object
1470414711
ipFamilyPolicy:
14705-
enum:
14706-
- SingleStack
14707-
- PreferDualStack
14708-
- RequireDualStack
1470914712
type: string
1471014713
labels:
1471114714
additionalProperties:
1471214715
type: string
1471314716
type: object
1471414717
type:
14715-
default: ClusterIP
14716-
enum:
14717-
- ClusterIP
14718-
- LoadBalancer
14719-
- NodePort
1472014718
type: string
1472114719
type: object
1472214720
skipPostDeploySteps:
1472314721
type: boolean
14722+
storage:
14723+
properties:
14724+
storage:
14725+
anyOf:
14726+
- type: integer
14727+
- type: string
14728+
default: 10Gi
14729+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
14730+
x-kubernetes-int-or-string: true
14731+
storageClassName:
14732+
type: string
14733+
type: object
14734+
targetVersion:
14735+
pattern: ^\d+\.\d+(\.\d+)?$
14736+
type: string
1472414737
terminationGracePeriodSeconds:
14725-
default: 604800
14738+
default: 60
1472614739
format: int64
1472714740
minimum: 0
1472814741
type: integer
@@ -14751,6 +14764,7 @@ spec:
1475114764
type: string
1475214765
type: object
1475314766
type: array
14767+
x-kubernetes-list-type: atomic
1475414768
topologyRef:
1475514769
properties:
1475614770
name:
@@ -21465,6 +21479,8 @@ spec:
2146521479
properties:
2146621480
glanceWsgi:
2146721481
type: string
21482+
rabbitmqVersion:
21483+
type: string
2146821484
type: object
2146921485
type: object
2147021486
availableVersion:
@@ -21900,6 +21916,8 @@ spec:
2190021916
properties:
2190121917
glanceWsgi:
2190221918
type: string
21919+
rabbitmqVersion:
21920+
type: string
2190321921
type: object
2190421922
trackedCustomImages:
2190521923
additionalProperties:

0 commit comments

Comments
 (0)