Skip to content

Commit a494e55

Browse files
lmiccinilmiccini
committed
move notificationsbusinstance migration to controller
1 parent 0cc24a2 commit a494e55

36 files changed

Lines changed: 594 additions & 179 deletions

File tree

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6760,6 +6760,11 @@ spec:
67606760
default: 60
67616761
minimum: 10
67626762
type: integer
6763+
auth:
6764+
properties:
6765+
applicationCredentialSecret:
6766+
type: string
6767+
type: object
67636768
customServiceConfig:
67646769
default: '# add your customization here'
67656770
type: string
@@ -7021,6 +7026,11 @@ spec:
70217026
type: array
70227027
ironicInspector:
70237028
properties:
7029+
auth:
7030+
properties:
7031+
applicationCredentialSecret:
7032+
type: string
7033+
type: object
70247034
customServiceConfig:
70257035
default: '# add your customization here'
70267036
type: string
@@ -11446,6 +11456,11 @@ spec:
1144611456
apiTimeout:
1144711457
default: 120
1144811458
type: integer
11459+
auth:
11460+
properties:
11461+
applicationCredentialSecret:
11462+
type: string
11463+
type: object
1144911464
customServiceConfig:
1145011465
default: '# add your customization here'
1145111466
type: string
@@ -11512,6 +11527,11 @@ spec:
1151211527
properties:
1151311528
apiTimeout:
1151411529
type: integer
11530+
auth:
11531+
properties:
11532+
applicationCredentialSecret:
11533+
type: string
11534+
type: object
1151511535
customServiceConfig:
1151611536
default: '# add your customization here'
1151711537
type: string
@@ -11722,6 +11742,11 @@ spec:
1172211742
amphoraImageOwnerID:
1172311743
default: ""
1172411744
type: string
11745+
auth:
11746+
properties:
11747+
applicationCredentialSecret:
11748+
type: string
11749+
type: object
1172511750
customServiceConfig:
1172611751
default: '# add your customization here'
1172711752
type: string
@@ -11876,6 +11901,11 @@ spec:
1187611901
amphoraImageOwnerID:
1187711902
default: ""
1187811903
type: string
11904+
auth:
11905+
properties:
11906+
applicationCredentialSecret:
11907+
type: string
11908+
type: object
1187911909
customServiceConfig:
1188011910
default: '# add your customization here'
1188111911
type: string
@@ -12136,6 +12166,11 @@ spec:
1213612166
amphoraImageOwnerID:
1213712167
default: ""
1213812168
type: string
12169+
auth:
12170+
properties:
12171+
applicationCredentialSecret:
12172+
type: string
12173+
type: object
1213912174
customServiceConfig:
1214012175
default: '# add your customization here'
1214112176
type: string
@@ -14154,6 +14189,11 @@ spec:
1415414189
default: 60
1415514190
minimum: 1
1415614191
type: integer
14192+
auth:
14193+
properties:
14194+
applicationCredentialSecret:
14195+
type: string
14196+
type: object
1415714197
ceilometerEnabled:
1415814198
default: false
1415914199
type: boolean

‎api/core/v1beta1/openstackcontrolplane_webhook.go‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -872,13 +872,9 @@ func setOverrideSpec(override **route.OverrideSpec, anno map[string]string) {
872872

873873
// DefaultServices - common function for calling individual services' defaulting functions
874874
func (r *OpenStackControlPlane) DefaultServices() {
875-
// Default NotificationsBus if NotificationsBusInstance is specified
876-
if r.Spec.NotificationsBusInstance != nil && *r.Spec.NotificationsBusInstance != "" {
877-
if r.Spec.NotificationsBus == nil {
878-
r.Spec.NotificationsBus = &rabbitmqv1.RabbitMqConfig{}
879-
}
880-
rabbitmqv1.DefaultRabbitMqConfig(r.Spec.NotificationsBus, *r.Spec.NotificationsBusInstance)
881-
}
875+
// Top-level NotificationsBusInstance migration is handled in the reconcile loop
876+
// to properly support migration from the deprecated field. The webhook doesn't
877+
// have access to the old object to distinguish between user overrides and defaults.
882878

883879
// Cinder
884880
if r.Spec.Cinder.Enabled || r.Spec.Cinder.Template != nil {

‎api/go.mod‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ go 1.24.4
55
require (
66
github.com/cert-manager/cert-manager v1.16.5
77
github.com/go-playground/validator/v10 v10.30.1
8-
github.com/onsi/ginkgo/v2 v2.27.5
9-
github.com/onsi/gomega v1.39.0
8+
github.com/onsi/ginkgo/v2 v2.28.1
9+
github.com/onsi/gomega v1.39.1
1010
github.com/openstack-k8s-operators/barbican-operator/api v0.6.1-0.20260126155915-bd373daa8e8c
1111
github.com/openstack-k8s-operators/cinder-operator/api v0.6.1-0.20260124150910-c004203b9504
1212
github.com/openstack-k8s-operators/designate-operator/api v0.6.1-0.20260126110625-223581247a61
@@ -16,8 +16,8 @@ require (
1616
github.com/openstack-k8s-operators/infra-operator/apis v0.6.1-0.20260128074606-03b808364e4a
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.6.1-0.20260126092810-cd39d45b6c0e
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.6.1-0.20260126175636-114b4c65a959
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260126081203-efc2df9207eb
20-
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260126081203-efc2df9207eb
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.6.1-0.20260128142552-e2c25eccae5a
20+
github.com/openstack-k8s-operators/lib-common/modules/storage v0.6.1-0.20260128142552-e2c25eccae5a
2121
github.com/openstack-k8s-operators/manila-operator/api v0.6.1-0.20260124125332-5046d6342e48
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.6.1-0.20260127154438-ff95971883bb
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.6.1-0.20260128083308-da1a0d762151
@@ -34,7 +34,7 @@ require (
3434
go.uber.org/multierr v1.11.0 // indirect
3535
go.uber.org/zap v1.27.1 // indirect
3636
golang.org/x/exp v0.0.0-20241217172543-b2144cdd0a67
37-
golang.org/x/tools v0.40.0 // indirect
37+
golang.org/x/tools v0.41.0 // indirect
3838
k8s.io/api v0.31.14
3939
k8s.io/apimachinery v0.31.14
4040
k8s.io/client-go v0.31.14
@@ -66,7 +66,7 @@ require (
6666
github.com/google/gnostic-models v0.7.0 // indirect
6767
github.com/google/go-cmp v0.7.0 // indirect
6868
github.com/google/gofuzz v1.2.0 // indirect
69-
github.com/google/pprof v0.0.0-20250403155104-27863c87afa6 // indirect
69+
github.com/google/pprof v0.0.0-20260115054156-294ebfa9ad83 // indirect
7070
github.com/google/uuid v1.6.0 // indirect
7171
github.com/gophercloud/gophercloud/v2 v2.8.0 // indirect
7272
github.com/imdario/mergo v0.3.16 // indirect
@@ -92,9 +92,9 @@ require (
9292
github.com/x448/float16 v0.8.4 // indirect
9393
go.yaml.in/yaml/v2 v2.4.2 // indirect
9494
go.yaml.in/yaml/v3 v3.0.4 // indirect
95-
golang.org/x/crypto v0.46.0 // indirect
96-
golang.org/x/mod v0.31.0 // indirect
97-
golang.org/x/net v0.48.0 // indirect
95+
golang.org/x/crypto v0.47.0 // indirect
96+
golang.org/x/mod v0.32.0 // indirect
97+
golang.org/x/net v0.49.0 // indirect
9898
golang.org/x/oauth2 v0.30.0 // indirect
9999
golang.org/x/sync v0.19.0 // indirect
100100
golang.org/x/sys v0.40.0 // indirect
@@ -144,30 +144,30 @@ replace k8s.io/component-base => k8s.io/component-base v0.31.14 //allow-merging
144144

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

147-
replace github.com/openstack-k8s-operators/barbican-operator/api => github.com/lmiccini/barbican-operator/api v0.0.0-20260129195435-4c4763914238
147+
replace github.com/openstack-k8s-operators/barbican-operator/api => github.com/lmiccini/barbican-operator/api v0.0.0-20260130153748-c0862ee80f6b
148148

149-
replace github.com/openstack-k8s-operators/cinder-operator/api => github.com/lmiccini/cinder-operator/api v0.0.0-20260129195511-0d2903ecac75
149+
replace github.com/openstack-k8s-operators/cinder-operator/api => github.com/lmiccini/cinder-operator/api v0.0.0-20260202093015-f8d1f14c9976
150150

151151
replace github.com/openstack-k8s-operators/designate-operator/api => github.com/lmiccini/designate-operator/api v0.0.0-20260129195526-07a2bbdbbbc6
152152

153-
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/lmiccini/glance-operator/api v0.0.0-20260129195538-5b3c2fe872f7
153+
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/lmiccini/glance-operator/api v0.0.0-20260202091739-732301c2f4bd
154154

155-
replace github.com/openstack-k8s-operators/heat-operator/api => github.com/lmiccini/heat-operator/api v0.0.0-20260129195640-f1137d273619
155+
replace github.com/openstack-k8s-operators/heat-operator/api => github.com/lmiccini/heat-operator/api v0.0.0-20260130153836-0162a8fbe588
156156

157-
replace github.com/openstack-k8s-operators/ironic-operator/api => github.com/lmiccini/ironic-operator/api v0.0.0-20260130070940-668bd2fa4901
157+
replace github.com/openstack-k8s-operators/ironic-operator/api => github.com/lmiccini/ironic-operator/api v0.0.0-20260131142856-7901596a1d2d
158158

159-
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/lmiccini/keystone-operator/api v0.0.0-20260129195740-1b691198bdd0
159+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/lmiccini/keystone-operator/api v0.0.0-20260130154009-73911b575f47
160160

161-
replace github.com/openstack-k8s-operators/manila-operator/api => github.com/lmiccini/manila-operator/api v0.0.0-20260129195800-215a1bb9e623
161+
replace github.com/openstack-k8s-operators/manila-operator/api => github.com/lmiccini/manila-operator/api v0.0.0-20260202092925-8fd99e616d6e
162162

163-
replace github.com/openstack-k8s-operators/neutron-operator/api => github.com/lmiccini/neutron-operator/api v0.0.0-20260129195824-46964feaebad
163+
replace github.com/openstack-k8s-operators/neutron-operator/api => github.com/lmiccini/neutron-operator/api v0.0.0-20260130154215-206cdc241686
164164

165-
replace github.com/openstack-k8s-operators/nova-operator/api => github.com/lmiccini/nova-operator/api v0.0.0-20260129195845-8130899633b5
165+
replace github.com/openstack-k8s-operators/nova-operator/api => github.com/lmiccini/nova-operator/api v0.0.0-20260130154456-145dc1dc3e11
166166

167-
replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/lmiccini/octavia-operator/api v0.0.0-20260129195900-f6bf3a78a669
167+
replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/lmiccini/octavia-operator/api v0.0.0-20260131142608-b5b99abd4e39
168168

169-
replace github.com/openstack-k8s-operators/swift-operator/api => github.com/lmiccini/swift-operator/api v0.0.0-20260130064124-cdb5cb2d15d0
169+
replace github.com/openstack-k8s-operators/swift-operator/api => github.com/lmiccini/swift-operator/api v0.0.0-20260201083840-dc87b8fbd348
170170

171-
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260130070733-39cf42d1afac
171+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260131062257-ce08c2f17769
172172

173-
replace github.com/openstack-k8s-operators/watcher-operator/api => github.com/lmiccini/watcher-operator/api v0.0.0-20260129200055-041ac0b5cc0e
173+
replace github.com/openstack-k8s-operators/watcher-operator/api => github.com/lmiccini/watcher-operator/api v0.0.0-20260130155151-6da48495bd84

0 commit comments

Comments
 (0)