Skip to content

Commit b78ccd9

Browse files
lmiccinilmiccini
committed
Drop rabbitmq-cluster-operator and add rabbitmq version label
Remove all rabbitmq-cluster-operator references, CRDs, RBAC, and deployment manifests from openstack-operator. Use custom infra-operator image that no longer depends on the rabbitmq-cluster-operator. Add RabbitmqVersion field to ServiceDefaults and set the target rabbitmq-server version (4.2) in the RabbitMQ spec during reconciliation.
1 parent 36856d2 commit b78ccd9

28 files changed

Lines changed: 357 additions & 6070 deletions

‎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: 33 additions & 26 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:
@@ -14355,13 +14362,6 @@ spec:
1435514362
minimum: 0
1435614363
type: integer
1435714364
resources:
14358-
default:
14359-
limits:
14360-
cpu: 2000m
14361-
memory: 2Gi
14362-
requests:
14363-
cpu: 1000m
14364-
memory: 2Gi
1436514365
properties:
1436614366
claims:
1436714367
items:
@@ -14437,25 +14437,31 @@ spec:
1443714437
type: string
1443814438
type: object
1443914439
ipFamilyPolicy:
14440-
enum:
14441-
- SingleStack
14442-
- PreferDualStack
14443-
- RequireDualStack
1444414440
type: string
1444514441
labels:
1444614442
additionalProperties:
1444714443
type: string
1444814444
type: object
1444914445
type:
14450-
default: ClusterIP
14451-
enum:
14452-
- ClusterIP
14453-
- LoadBalancer
14454-
- NodePort
1445514446
type: string
1445614447
type: object
1445714448
skipPostDeploySteps:
1445814449
type: boolean
14450+
storage:
14451+
properties:
14452+
storage:
14453+
anyOf:
14454+
- type: integer
14455+
- type: string
14456+
default: 10Gi
14457+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
14458+
x-kubernetes-int-or-string: true
14459+
storageClassName:
14460+
type: string
14461+
type: object
14462+
targetVersion:
14463+
pattern: ^\d+\.\d+(\.\d+)?$
14464+
type: string
1445914465
terminationGracePeriodSeconds:
1446014466
default: 604800
1446114467
format: int64
@@ -14486,6 +14492,7 @@ spec:
1448614492
type: string
1448714493
type: object
1448814494
type: array
14495+
x-kubernetes-list-type: atomic
1448914496
topologyRef:
1449014497
properties:
1449114498
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-20260320064739-f0ac8a3e9b4a

‎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-20260320064739-f0ac8a3e9b4a h1:y6ZZF2AcJYd8omyf6ZZnWIi9AHUqg/V5hg2ttQjj8DI=
94+
github.com/lmiccini/infra-operator/apis v0.0.0-20260320064739-f0ac8a3e9b4a/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

0 commit comments

Comments
 (0)