Skip to content

Commit 8d246a5

Browse files
lmicciniclaude
lmiccini
and
claude
committed
Migrate override.service fields after DeepCopyInto in RabbitMQ reconcile
DeepCopyInto overwrites the entire RabbitMqSpecCore from the template, which may have override.service set (old format) but not service.type (new format). Propagate override.service values to the service field after DeepCopyInto to avoid relying solely on the webhook for migration. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
1 parent 5d2c550 commit 8d246a5

12 files changed

Lines changed: 362 additions & 603 deletions

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

Lines changed: 10 additions & 79 deletions
Original file line numberDiff line numberDiff line change
@@ -14160,6 +14160,7 @@ spec:
1416014160
delayStartSeconds:
1416114161
default: 30
1416214162
format: int32
14163+
minimum: 0
1416314164
type: integer
1416414165
nodeSelector:
1416514166
additionalProperties:
@@ -14182,81 +14183,21 @@ spec:
1418214183
type: object
1418314184
spec:
1418414185
properties:
14185-
allocateLoadBalancerNodePorts:
14186-
type: boolean
14187-
clusterIP:
14188-
type: string
14189-
clusterIPs:
14190-
items:
14191-
type: string
14192-
type: array
14193-
x-kubernetes-list-type: atomic
14194-
externalIPs:
14195-
items:
14196-
type: string
14197-
type: array
14198-
x-kubernetes-list-type: atomic
1419914186
externalName:
1420014187
type: string
1420114188
externalTrafficPolicy:
1420214189
type: string
14203-
healthCheckNodePort:
14204-
format: int32
14205-
type: integer
1420614190
internalTrafficPolicy:
1420714191
type: string
14208-
ipFamilies:
14209-
items:
14210-
type: string
14211-
type: array
14212-
x-kubernetes-list-type: atomic
1421314192
ipFamilyPolicy:
1421414193
type: string
1421514194
loadBalancerClass:
1421614195
type: string
14217-
loadBalancerIP:
14218-
type: string
1421914196
loadBalancerSourceRanges:
1422014197
items:
1422114198
type: string
1422214199
type: array
1422314200
x-kubernetes-list-type: atomic
14224-
ports:
14225-
items:
14226-
properties:
14227-
appProtocol:
14228-
type: string
14229-
name:
14230-
type: string
14231-
nodePort:
14232-
format: int32
14233-
type: integer
14234-
port:
14235-
format: int32
14236-
type: integer
14237-
protocol:
14238-
default: TCP
14239-
type: string
14240-
targetPort:
14241-
anyOf:
14242-
- type: integer
14243-
- type: string
14244-
x-kubernetes-int-or-string: true
14245-
required:
14246-
- port
14247-
type: object
14248-
type: array
14249-
x-kubernetes-list-map-keys:
14250-
- port
14251-
- protocol
14252-
x-kubernetes-list-type: map
14253-
publishNotReadyAddresses:
14254-
type: boolean
14255-
selector:
14256-
additionalProperties:
14257-
type: string
14258-
type: object
14259-
x-kubernetes-map-type: atomic
1426014201
sessionAffinity:
1426114202
type: string
1426214203
sessionAffinityConfig:
@@ -14268,8 +14209,6 @@ spec:
1426814209
type: integer
1426914210
type: object
1427014211
type: object
14271-
trafficDistribution:
14272-
type: string
1427314212
type:
1427414213
type: string
1427514214
type: object
@@ -14278,7 +14217,6 @@ spec:
1427814217
type: object
1427914218
x-kubernetes-preserve-unknown-fields: true
1428014219
type: object
14281-
x-kubernetes-preserve-unknown-fields: true
1428214220
persistence:
1428314221
properties:
1428414222
storage:
@@ -14343,20 +14281,29 @@ spec:
1434314281
x-kubernetes-list-type: atomic
1434414282
type: object
1434514283
queueType:
14284+
enum:
14285+
- Mirrored
14286+
- Quorum
14287+
- ""
1434614288
type: string
1434714289
rabbitmq:
1434814290
properties:
1434914291
additionalConfig:
14292+
maxLength: 100000
1435014293
type: string
1435114294
additionalPlugins:
1435214295
items:
1435314296
type: string
14297+
maxItems: 100
1435414298
type: array
1435514299
advancedConfig:
14300+
maxLength: 100000
1435614301
type: string
1435714302
envConfig:
14303+
maxLength: 100000
1435814304
type: string
1435914305
erlangInetConfig:
14306+
maxLength: 2000
1436014307
type: string
1436114308
type: object
1436214309
replicas:
@@ -14440,21 +14387,6 @@ spec:
1444014387
type: object
1444114388
type: object
1444214389
type: object
14443-
service:
14444-
properties:
14445-
annotations:
14446-
additionalProperties:
14447-
type: string
14448-
type: object
14449-
ipFamilyPolicy:
14450-
type: string
14451-
labels:
14452-
additionalProperties:
14453-
type: string
14454-
type: object
14455-
type:
14456-
type: string
14457-
type: object
1445814390
skipPostDeploySteps:
1445914391
type: boolean
1446014392
storage:
@@ -14463,7 +14395,6 @@ spec:
1446314395
anyOf:
1446414396
- type: integer
1446514397
- type: string
14466-
default: 10Gi
1446714398
pattern: ^(\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))(([KMGTPE]i)|[numkMGTPE]|([eE](\+|-)?(([0-9]+(\.[0-9]*)?)|(\.[0-9]+))))?$
1446814399
x-kubernetes-int-or-string: true
1446914400
storageClassName:

‎api/go.mod‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ require (
1616
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260316100655-863ae03d41af
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260321081258-5c806856eeb6
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260321081256-de45f3b1de4f
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260324115114-e3be8a47a45e
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260331122750-ecff41ebb61d
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260324115114-e3be8a47a45e
2121
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260321081547-64d64a0c02c7
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260321081546-85bcf5293c70
@@ -143,4 +143,4 @@ replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
143143

144144
replace github.com/cert-manager/cmctl/v2 => github.com/cert-manager/cmctl/v2 v2.1.2-0.20241127223932-88edb96860cf //allow-merging
145145

146-
replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/lmiccini/infra-operator/apis v0.0.0-20260320164938-2057972ad9de
146+
replace github.com/openstack-k8s-operators/infra-operator/apis => github.com/lmiccini/infra-operator/apis v0.0.0-20260402062351-aec7490a693d

0 commit comments

Comments
 (0)