Skip to content

Commit c1f1bae

Browse files
lmiccinilmiccini
committed
test fix for kuttl
1 parent 6b8c49a commit c1f1bae

21 files changed

Lines changed: 244 additions & 343 deletions

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

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -14939,18 +14939,6 @@ spec:
1493914939
memcachedInstance:
1494014940
default: memcached
1494114941
type: string
14942-
messagingBus:
14943-
properties:
14944-
cluster:
14945-
minLength: 1
14946-
type: string
14947-
user:
14948-
type: string
14949-
vhost:
14950-
type: string
14951-
required:
14952-
- cluster
14953-
type: object
1495414942
networkAttachmentDefinitions:
1495514943
items:
1495614944
type: string
@@ -15135,18 +15123,6 @@ spec:
1513515123
secretName:
1513615124
type: string
1513715125
type: object
15138-
messagingBus:
15139-
properties:
15140-
cluster:
15141-
minLength: 1
15142-
type: string
15143-
user:
15144-
type: string
15145-
vhost:
15146-
type: string
15147-
required:
15148-
- cluster
15149-
type: object
1515015126
mysqldExporterDatabaseAccountPrefix:
1515115127
default: mysqld-exporter
1515215128
type: string
@@ -15474,18 +15450,6 @@ spec:
1547415450
additionalProperties:
1547515451
type: string
1547615452
type: object
15477-
notificationsBus:
15478-
properties:
15479-
cluster:
15480-
minLength: 1
15481-
type: string
15482-
user:
15483-
type: string
15484-
vhost:
15485-
type: string
15486-
required:
15487-
- cluster
15488-
type: object
1548915453
passwordSelector:
1549015454
default:
1549115455
cloudKittyService: CloudKittyPassword

‎api/core/v1beta1/openstackcontrolplane_webhook.go‎

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,9 @@ func (r *OpenStackControlPlane) DefaultServices() {
881881
if r.Spec.Cinder.Template.MessagingBus.Cluster == "" {
882882
r.Spec.Cinder.Template.MessagingBus.Cluster = "rabbitmq"
883883
}
884+
// NotificationsBus propagation is handled in the reconcile loop to properly support
885+
// both inheritance and clearing. The webhook doesn't have access to the old object
886+
// to distinguish between user overrides and inherited values.
884887
r.Spec.Cinder.Template.Default()
885888
initializeOverrideSpec(&r.Spec.Cinder.APIOverride.Route, true)
886889
r.Spec.Cinder.Template.SetDefaultRouteAnnotations(r.Spec.Cinder.APIOverride.Route.Annotations)
@@ -910,7 +913,9 @@ func (r *OpenStackControlPlane) DefaultServices() {
910913
if r.Spec.Glance.Template == nil {
911914
r.Spec.Glance.Template = &glancev1.GlanceSpecCore{}
912915
}
913-
// Glance only uses NotificationsBus (optional) - don't default it
916+
// NotificationsBus propagation is handled in the reconcile loop to properly support
917+
// both inheritance and clearing. The webhook doesn't have access to the old object
918+
// to distinguish between user overrides and inherited values.
914919
r.Spec.Glance.Template.Default()
915920
// initialize the main APIOverride struct
916921
if r.Spec.Glance.APIOverride == nil {
@@ -975,7 +980,9 @@ func (r *OpenStackControlPlane) DefaultServices() {
975980
if r.Spec.Keystone.Template == nil {
976981
r.Spec.Keystone.Template = &keystonev1.KeystoneAPISpecCore{}
977982
}
978-
// Keystone only uses NotificationsBus (optional) - don't default it
983+
// NotificationsBus propagation is handled in the reconcile loop to properly support
984+
// both inheritance and clearing. The webhook doesn't have access to the old object
985+
// to distinguish between user overrides and inherited values.
979986
r.Spec.Keystone.Template.Default()
980987
initializeOverrideSpec(&r.Spec.Keystone.APIOverride.Route, true)
981988
r.Spec.Keystone.Template.SetDefaultRouteAnnotations(r.Spec.Keystone.APIOverride.Route.Annotations)
@@ -990,6 +997,9 @@ func (r *OpenStackControlPlane) DefaultServices() {
990997
if r.Spec.Manila.Template.MessagingBus.Cluster == "" {
991998
r.Spec.Manila.Template.MessagingBus.Cluster = "rabbitmq"
992999
}
1000+
// NotificationsBus propagation is handled in the reconcile loop to properly support
1001+
// both inheritance and clearing. The webhook doesn't have access to the old object
1002+
// to distinguish between user overrides and inherited values.
9931003
r.Spec.Manila.Template.Default()
9941004
initializeOverrideSpec(&r.Spec.Manila.APIOverride.Route, true)
9951005
r.Spec.Manila.Template.SetDefaultRouteAnnotations(r.Spec.Manila.APIOverride.Route.Annotations)
@@ -1017,6 +1027,9 @@ func (r *OpenStackControlPlane) DefaultServices() {
10171027
if r.Spec.Neutron.Template.MessagingBus.Cluster == "" {
10181028
r.Spec.Neutron.Template.MessagingBus.Cluster = "rabbitmq"
10191029
}
1030+
// NotificationsBus propagation is handled in the reconcile loop to properly support
1031+
// both inheritance and clearing. The webhook doesn't have access to the old object
1032+
// to distinguish between user overrides and inherited values.
10201033
r.Spec.Neutron.Template.Default()
10211034
initializeOverrideSpec(&r.Spec.Neutron.APIOverride.Route, true)
10221035
r.Spec.Neutron.Template.SetDefaultRouteAnnotations(r.Spec.Neutron.APIOverride.Route.Annotations)
@@ -1032,6 +1045,9 @@ func (r *OpenStackControlPlane) DefaultServices() {
10321045
if r.Spec.Nova.Template.MessagingBus.Cluster == "" {
10331046
r.Spec.Nova.Template.MessagingBus.Cluster = "rabbitmq"
10341047
}
1048+
// NotificationsBus propagation is handled in the reconcile loop to properly support
1049+
// both inheritance and clearing. The webhook doesn't have access to the old object
1050+
// to distinguish between user overrides and inherited values.
10351051
r.Spec.Nova.Template.Default()
10361052
initializeOverrideSpec(&r.Spec.Nova.APIOverride.Route, true)
10371053
r.Spec.Nova.Template.SetDefaultRouteAnnotations(r.Spec.Nova.APIOverride.Route.Annotations)
@@ -1183,6 +1199,9 @@ func (r *OpenStackControlPlane) DefaultServices() {
11831199
if r.Spec.Watcher.Template.MessagingBus.Cluster == "" {
11841200
r.Spec.Watcher.Template.MessagingBus.Cluster = "rabbitmq"
11851201
}
1202+
// NotificationsBus propagation is handled in the reconcile loop to properly support
1203+
// both inheritance and clearing. The webhook doesn't have access to the old object
1204+
// to distinguish between user overrides and inherited values.
11861205
r.Spec.Watcher.Template.Default()
11871206

11881207
if r.Spec.Watcher.Enabled {

‎api/go.mod‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -144,28 +144,28 @@ 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-20260126220103-3c1a406634e0
147+
replace github.com/openstack-k8s-operators/barbican-operator/api => github.com/lmiccini/barbican-operator/api v0.0.0-20260128143030-6e2c19a0954f
148148

149-
replace github.com/openstack-k8s-operators/cinder-operator/api => github.com/lmiccini/cinder-operator/api v0.0.0-20260126132031-a3b37e4b86ae
149+
replace github.com/openstack-k8s-operators/cinder-operator/api => github.com/lmiccini/cinder-operator/api v0.0.0-20260128143047-7e5a34a93442
150150

151-
replace github.com/openstack-k8s-operators/designate-operator/api => github.com/lmiccini/designate-operator/api v0.0.0-20260126121522-86cef6d26d0a
151+
replace github.com/openstack-k8s-operators/designate-operator/api => github.com/lmiccini/designate-operator/api v0.0.0-20260128143100-db65ae8f43cc
152152

153-
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/lmiccini/glance-operator/api v0.0.0-20260126082232-7d867f42a4dc
153+
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/lmiccini/glance-operator/api v0.0.0-20260128144034-ac88c150a375
154154

155-
replace github.com/openstack-k8s-operators/heat-operator/api => github.com/lmiccini/heat-operator/api v0.0.0-20260127054124-683e1784b7eb
155+
replace github.com/openstack-k8s-operators/heat-operator/api => github.com/lmiccini/heat-operator/api v0.0.0-20260128143213-fa78779535d8
156156

157-
replace github.com/openstack-k8s-operators/ironic-operator/api => github.com/lmiccini/ironic-operator/api v0.0.0-20260126122431-1f3ba4559582
157+
replace github.com/openstack-k8s-operators/ironic-operator/api => github.com/lmiccini/ironic-operator/api v0.0.0-20260128143237-ea4543df3248
158158

159-
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/lmiccini/keystone-operator/api v0.0.0-20260126134229-5c4ccd648c80
159+
replace github.com/openstack-k8s-operators/keystone-operator/api => github.com/lmiccini/keystone-operator/api v0.0.0-20260128165211-2f29d34114a0
160160

161-
replace github.com/openstack-k8s-operators/manila-operator/api => github.com/lmiccini/manila-operator/api v0.0.0-20260126132043-0c4c21f3108c
161+
replace github.com/openstack-k8s-operators/manila-operator/api => github.com/lmiccini/manila-operator/api v0.0.0-20260128143259-389cebc83319
162162

163-
replace github.com/openstack-k8s-operators/neutron-operator/api => github.com/lmiccini/neutron-operator/api v0.0.0-20260126123412-122eb24114b3
163+
replace github.com/openstack-k8s-operators/neutron-operator/api => github.com/lmiccini/neutron-operator/api v0.0.0-20260128143313-042d4ad8378e
164164

165-
replace github.com/openstack-k8s-operators/nova-operator/api => github.com/lmiccini/nova-operator/api v0.0.0-20260126124220-1804867abea6
165+
replace github.com/openstack-k8s-operators/nova-operator/api => github.com/lmiccini/nova-operator/api v0.0.0-20260127121731-30194218c620
166166

167-
replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/lmiccini/octavia-operator/api v0.0.0-20260126220543-7499a1432042
167+
replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/lmiccini/octavia-operator/api v0.0.0-20260129041150-3641c8995c61
168168

169-
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260126124705-8bd837c8c2e9
169+
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260129024318-6c13b4fe5133
170170

171-
replace github.com/openstack-k8s-operators/watcher-operator/api => github.com/lmiccini/watcher-operator/api v0.0.0-20260127055809-ce41ef12e898
171+
replace github.com/openstack-k8s-operators/watcher-operator/api => github.com/lmiccini/watcher-operator/api v0.0.0-20260127173458-8b30c5e7d456

‎api/go.sum‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -90,32 +90,32 @@ 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/barbican-operator/api v0.0.0-20260126220103-3c1a406634e0 h1:9Fun85tD3XQ59jk3sgBFLa0csLipVEWFtMEf5zYhhMU=
94-
github.com/lmiccini/barbican-operator/api v0.0.0-20260126220103-3c1a406634e0/go.mod h1:KQnoNfCO5HHB/P6MAOE2u9V1wQbQxy5n51p8W7Dki4E=
95-
github.com/lmiccini/cinder-operator/api v0.0.0-20260126132031-a3b37e4b86ae h1:yCl/fPdjmSZVYM6fqyqWt2KnuQ0Q9txSyS6F7sXuwQQ=
96-
github.com/lmiccini/cinder-operator/api v0.0.0-20260126132031-a3b37e4b86ae/go.mod h1:0xHInxPRXyJNl6qnt0fn5BxGFggzASzcA9JVrumO8TI=
97-
github.com/lmiccini/designate-operator/api v0.0.0-20260126121522-86cef6d26d0a h1:Vg1xa4JjVnYi1pOhRKD2Ye/KgMqudOjasqISrwSviVo=
98-
github.com/lmiccini/designate-operator/api v0.0.0-20260126121522-86cef6d26d0a/go.mod h1:NllEsgsxg+lGMajtk9IaVGaU5ZcQQNMxhwkLhnhl28w=
99-
github.com/lmiccini/glance-operator/api v0.0.0-20260126082232-7d867f42a4dc h1:UGlIvMGviaqeBSnCuv6nhr3DBzPbkaIEZ8qXML3d7XE=
100-
github.com/lmiccini/glance-operator/api v0.0.0-20260126082232-7d867f42a4dc/go.mod h1:AEZ1xH8KnaDA/3rJDQQMbEBzMD8nitomm36d/TZvMj0=
101-
github.com/lmiccini/heat-operator/api v0.0.0-20260127054124-683e1784b7eb h1:4OCcKNTp7WR741kQlSRyu5vblnPk2+3tt6woO0majsI=
102-
github.com/lmiccini/heat-operator/api v0.0.0-20260127054124-683e1784b7eb/go.mod h1:T5lLlPNIJZuXRh8J1PwA1sZL3fgERGYHfisfcKZm2bI=
103-
github.com/lmiccini/ironic-operator/api v0.0.0-20260126122431-1f3ba4559582 h1:sksB1Mw6d8oVpJ8Vh6H8X/yYqJ8x+3QqMlkvml1t5Sc=
104-
github.com/lmiccini/ironic-operator/api v0.0.0-20260126122431-1f3ba4559582/go.mod h1:BbKlVhrD3sYFYsFhvG9+qPsCRygYv08Sd4M7o4n9XQQ=
105-
github.com/lmiccini/keystone-operator/api v0.0.0-20260126134229-5c4ccd648c80 h1:IRu3VJ/zCDbkebLngjmBV4jgSx6m9lcLj1rgsu4itro=
106-
github.com/lmiccini/keystone-operator/api v0.0.0-20260126134229-5c4ccd648c80/go.mod h1:097T7Mt1uDKyKjAEPpZ8M4GBe9OdrisDNogCecclK6k=
107-
github.com/lmiccini/manila-operator/api v0.0.0-20260126132043-0c4c21f3108c h1:k97/qjr+FdMCbH+eUAEzcncrOoSFpYsF68WGPhjOw9k=
108-
github.com/lmiccini/manila-operator/api v0.0.0-20260126132043-0c4c21f3108c/go.mod h1:LtrSM0FypW3nxiRzAlk+Dk8ZjFtCAYOl2msoXL3GAtg=
109-
github.com/lmiccini/neutron-operator/api v0.0.0-20260126123412-122eb24114b3 h1:DGEtxZeXd2RmyJDYNbYmDr7YaZWTs2yMwLUbFdjvEhM=
110-
github.com/lmiccini/neutron-operator/api v0.0.0-20260126123412-122eb24114b3/go.mod h1:P2br9yVt4dMCG1EgPj6k1wKc+QNvKaIFueLuRICwpi4=
111-
github.com/lmiccini/nova-operator/api v0.0.0-20260126124220-1804867abea6 h1:cbwb+v2nOq78c8HBIX3ONPc7pSPULHSZYLYmncKAeag=
112-
github.com/lmiccini/nova-operator/api v0.0.0-20260126124220-1804867abea6/go.mod h1:2doC9TTP6fd0kp/JZSEmwYgs/4ztCM9jLfzHin9r86Y=
113-
github.com/lmiccini/octavia-operator/api v0.0.0-20260126220543-7499a1432042 h1:Lf7khelUlsoEV8qsM2wYWZvSorhNYXEK5AF4PIpOeks=
114-
github.com/lmiccini/octavia-operator/api v0.0.0-20260126220543-7499a1432042/go.mod h1:U+xQIGQ6U3F+plwX3QTG1x/D6+tk/16h91/YbHPFRGU=
115-
github.com/lmiccini/telemetry-operator/api v0.0.0-20260126124705-8bd837c8c2e9 h1:Wno8VQ3vnpFTgRgB/qPL2THGOKouM6an68BwN48IPjs=
116-
github.com/lmiccini/telemetry-operator/api v0.0.0-20260126124705-8bd837c8c2e9/go.mod h1:PecH/poTfalzaxK/sZd+a8PLcGkf5D/HBtpUk9xdIbQ=
117-
github.com/lmiccini/watcher-operator/api v0.0.0-20260127055809-ce41ef12e898 h1:ofy8n06NTaqXO3wdSvzX8f9s9gG0pGMFsKK1EklQBh8=
118-
github.com/lmiccini/watcher-operator/api v0.0.0-20260127055809-ce41ef12e898/go.mod h1:XEJp64OcVDbT9G1gHowBBruWcZngWN4C5Z8UgpOoqvk=
93+
github.com/lmiccini/barbican-operator/api v0.0.0-20260128143030-6e2c19a0954f h1:d98KTXFbr8Hv7kVVgs9bMMC8hhKfUmU+gQRqbx4juto=
94+
github.com/lmiccini/barbican-operator/api v0.0.0-20260128143030-6e2c19a0954f/go.mod h1:KQnoNfCO5HHB/P6MAOE2u9V1wQbQxy5n51p8W7Dki4E=
95+
github.com/lmiccini/cinder-operator/api v0.0.0-20260128143047-7e5a34a93442 h1:7t8lxD237Dm1/tVZJi8cDnvzbRYAWG+4UcRLKen+9hw=
96+
github.com/lmiccini/cinder-operator/api v0.0.0-20260128143047-7e5a34a93442/go.mod h1:0xHInxPRXyJNl6qnt0fn5BxGFggzASzcA9JVrumO8TI=
97+
github.com/lmiccini/designate-operator/api v0.0.0-20260128143100-db65ae8f43cc h1:8m9g0sqCsR08sEsSYjvnNGbX6uBQNRqJ1ur8oAV1OtA=
98+
github.com/lmiccini/designate-operator/api v0.0.0-20260128143100-db65ae8f43cc/go.mod h1:2tyAJhSJSiGGG0NJqqvbh64EmVCCVKNZDqkWm/KdBZA=
99+
github.com/lmiccini/glance-operator/api v0.0.0-20260128144034-ac88c150a375 h1:YaNI4/6OrtgjJggF9x8qnCV5PGDwN+xScijVqycoTy0=
100+
github.com/lmiccini/glance-operator/api v0.0.0-20260128144034-ac88c150a375/go.mod h1:AEZ1xH8KnaDA/3rJDQQMbEBzMD8nitomm36d/TZvMj0=
101+
github.com/lmiccini/heat-operator/api v0.0.0-20260128143213-fa78779535d8 h1:8hBwqZbZtQ0G27wfk8Sc/gr5TqQL8uVVBO005RjWUCo=
102+
github.com/lmiccini/heat-operator/api v0.0.0-20260128143213-fa78779535d8/go.mod h1:T5lLlPNIJZuXRh8J1PwA1sZL3fgERGYHfisfcKZm2bI=
103+
github.com/lmiccini/ironic-operator/api v0.0.0-20260128143237-ea4543df3248 h1:9XXP6kL9YnaVtjAlHHpmzE8yJ4W4IzCDxIiTzIYMAG0=
104+
github.com/lmiccini/ironic-operator/api v0.0.0-20260128143237-ea4543df3248/go.mod h1:BbKlVhrD3sYFYsFhvG9+qPsCRygYv08Sd4M7o4n9XQQ=
105+
github.com/lmiccini/keystone-operator/api v0.0.0-20260128165211-2f29d34114a0 h1:SaDUCg9zQT2XqLP9Pb7SiTOPihn+3kiArhydSoFHh9Q=
106+
github.com/lmiccini/keystone-operator/api v0.0.0-20260128165211-2f29d34114a0/go.mod h1:097T7Mt1uDKyKjAEPpZ8M4GBe9OdrisDNogCecclK6k=
107+
github.com/lmiccini/manila-operator/api v0.0.0-20260128143259-389cebc83319 h1:VvoXeaqYyTJXoLH4X4Pf53FNvb7XOCA6xuH8Ss7jo4I=
108+
github.com/lmiccini/manila-operator/api v0.0.0-20260128143259-389cebc83319/go.mod h1:LtrSM0FypW3nxiRzAlk+Dk8ZjFtCAYOl2msoXL3GAtg=
109+
github.com/lmiccini/neutron-operator/api v0.0.0-20260128143313-042d4ad8378e h1:YLkojtrRxUz663dwlpD57gEI+3//yyY+0u+fKxn0DIw=
110+
github.com/lmiccini/neutron-operator/api v0.0.0-20260128143313-042d4ad8378e/go.mod h1:P2br9yVt4dMCG1EgPj6k1wKc+QNvKaIFueLuRICwpi4=
111+
github.com/lmiccini/nova-operator/api v0.0.0-20260127121731-30194218c620 h1:MHfLxUB9HXCwRrVGYem10+YeZCdeeHewF9/KKfg4RXk=
112+
github.com/lmiccini/nova-operator/api v0.0.0-20260127121731-30194218c620/go.mod h1:2doC9TTP6fd0kp/JZSEmwYgs/4ztCM9jLfzHin9r86Y=
113+
github.com/lmiccini/octavia-operator/api v0.0.0-20260129041150-3641c8995c61 h1:53WYfKQNDbDgXE489K1chZtES4i4BmSclSkq3lDb050=
114+
github.com/lmiccini/octavia-operator/api v0.0.0-20260129041150-3641c8995c61/go.mod h1:U+xQIGQ6U3F+plwX3QTG1x/D6+tk/16h91/YbHPFRGU=
115+
github.com/lmiccini/telemetry-operator/api v0.0.0-20260129024318-6c13b4fe5133 h1:HBLxEzcY5ni5FLLiJef0ZKsZPAjaf8mYl1Z5XvwQ/no=
116+
github.com/lmiccini/telemetry-operator/api v0.0.0-20260129024318-6c13b4fe5133/go.mod h1:XMn2KWjSbLhQ6Jczs3ZhPEAyNmz9b94bz3jKsdDVpag=
117+
github.com/lmiccini/watcher-operator/api v0.0.0-20260127173458-8b30c5e7d456 h1:1691D7iQXM5opRnQICMLqL5oEZ7/buppSTVLx3m/7O4=
118+
github.com/lmiccini/watcher-operator/api v0.0.0-20260127173458-8b30c5e7d456/go.mod h1:XEJp64OcVDbT9G1gHowBBruWcZngWN4C5Z8UgpOoqvk=
119119
github.com/mailru/easyjson v0.9.0 h1:PrnmzHw7262yW8sTBwxi1PdJA3Iw/EKBa8psRf7d9a4=
120120
github.com/mailru/easyjson v0.9.0/go.mod h1:1+xMtQp2MRNVL/V1bOzuP3aP8VNwRW55fQUto+XFtTU=
121121
github.com/maruel/natural v1.1.1 h1:Hja7XhhmvEFhcByqDoHz9QZbkWey+COd9xWfCfn1ioo=

0 commit comments

Comments
 (0)