Skip to content

Commit 5d2c550

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 55df25d commit 5d2c550

41 files changed

Lines changed: 569 additions & 6088 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
@@ -14141,10 +14141,25 @@ spec:
1414114141
x-kubernetes-list-type: atomic
1414214142
type: object
1414314143
type: object
14144+
config:
14145+
properties:
14146+
additionalConfig:
14147+
type: string
14148+
additionalPlugins:
14149+
items:
14150+
type: string
14151+
type: array
14152+
x-kubernetes-list-type: atomic
14153+
advancedConfig:
14154+
type: string
14155+
envConfig:
14156+
type: string
14157+
erlangInetConfig:
14158+
type: string
14159+
type: object
1414414160
delayStartSeconds:
1414514161
default: 30
1414614162
format: int32
14147-
minimum: 0
1414814163
type: integer
1414914164
nodeSelector:
1415014165
additionalProperties:
@@ -14263,9 +14278,8 @@ spec:
1426314278
type: object
1426414279
x-kubernetes-preserve-unknown-fields: true
1426514280
type: object
14281+
x-kubernetes-preserve-unknown-fields: true
1426614282
persistence:
14267-
default:
14268-
storage: 10Gi
1426914283
properties:
1427014284
storage:
1427114285
anyOf:
@@ -14333,23 +14347,16 @@ spec:
1433314347
rabbitmq:
1433414348
properties:
1433514349
additionalConfig:
14336-
maxLength: 100000
1433714350
type: string
1433814351
additionalPlugins:
1433914352
items:
14340-
maxLength: 100
14341-
pattern: ^\w+$
1434214353
type: string
14343-
maxItems: 100
1434414354
type: array
1434514355
advancedConfig:
14346-
maxLength: 100000
1434714356
type: string
1434814357
envConfig:
14349-
maxLength: 100000
1435014358
type: string
1435114359
erlangInetConfig:
14352-
maxLength: 2000
1435314360
type: string
1435414361
type: object
1435514362
replicas:
@@ -14440,27 +14447,33 @@ spec:
1444014447
type: string
1444114448
type: object
1444214449
ipFamilyPolicy:
14443-
enum:
14444-
- SingleStack
14445-
- PreferDualStack
14446-
- RequireDualStack
1444714450
type: string
1444814451
labels:
1444914452
additionalProperties:
1445014453
type: string
1445114454
type: object
1445214455
type:
14453-
default: ClusterIP
14454-
enum:
14455-
- ClusterIP
14456-
- LoadBalancer
14457-
- NodePort
1445814456
type: string
1445914457
type: object
1446014458
skipPostDeploySteps:
1446114459
type: boolean
14460+
storage:
14461+
properties:
14462+
storage:
14463+
anyOf:
14464+
- type: integer
14465+
- type: string
14466+
default: 10Gi
14467+
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
14468+
x-kubernetes-int-or-string: true
14469+
storageClassName:
14470+
type: string
14471+
type: object
14472+
targetVersion:
14473+
pattern: ^\d+\.\d+(\.\d+)?$
14474+
type: string
1446214475
terminationGracePeriodSeconds:
14463-
default: 604800
14476+
default: 60
1446414477
format: int64
1446514478
minimum: 0
1446614479
type: integer
@@ -14489,6 +14502,7 @@ spec:
1448914502
type: string
1449014503
type: object
1449114504
type: array
14505+
x-kubernetes-list-type: atomic
1449214506
topologyRef:
1449314507
properties:
1449414508
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

0 commit comments

Comments
 (0)