Skip to content

Commit 83d359c

Browse files
lmiccinilmiccini
committed
test fix for kuttl
1 parent f5e8a9d commit 83d359c

13 files changed

+112
-27
lines changed

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4799,6 +4799,16 @@ spec:
47994799
databaseInstance:
48004800
default: openstack
48014801
type: string
4802+
dbPurge:
4803+
properties:
4804+
age:
4805+
default: 30
4806+
minimum: 1
4807+
type: integer
4808+
schedule:
4809+
default: 1 0 * * *
4810+
type: string
4811+
type: object
48024812
defaultConfigOverwrite:
48034813
additionalProperties:
48044814
type: string

‎api/core/v1beta1/openstackcontrolplane_webhook.go‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,11 @@ func (r *OpenStackControlPlane) DefaultServices() {
881881
if r.Spec.Cinder.Template.MessagingBus.Cluster == "" {
882882
r.Spec.Cinder.Template.MessagingBus.Cluster = "rabbitmq"
883883
}
884+
// Propagate top-level NotificationsBus to template if not already set
885+
// This prevents the service operator's Default() from using the deprecated field
886+
if r.Spec.Cinder.Template.NotificationsBus == nil && r.Spec.NotificationsBus != nil {
887+
r.Spec.Cinder.Template.NotificationsBus = r.Spec.NotificationsBus
888+
}
884889
r.Spec.Cinder.Template.Default()
885890
initializeOverrideSpec(&r.Spec.Cinder.APIOverride.Route, true)
886891
r.Spec.Cinder.Template.SetDefaultRouteAnnotations(r.Spec.Cinder.APIOverride.Route.Annotations)
@@ -910,7 +915,11 @@ func (r *OpenStackControlPlane) DefaultServices() {
910915
if r.Spec.Glance.Template == nil {
911916
r.Spec.Glance.Template = &glancev1.GlanceSpecCore{}
912917
}
913-
// Glance only uses NotificationsBus (optional) - don't default it
918+
// Propagate top-level NotificationsBus to template if not already set
919+
// This prevents the service operator's Default() from using the deprecated field
920+
if r.Spec.Glance.Template.NotificationsBus == nil && r.Spec.NotificationsBus != nil {
921+
r.Spec.Glance.Template.NotificationsBus = r.Spec.NotificationsBus
922+
}
914923
r.Spec.Glance.Template.Default()
915924
// initialize the main APIOverride struct
916925
if r.Spec.Glance.APIOverride == nil {
@@ -975,7 +984,11 @@ func (r *OpenStackControlPlane) DefaultServices() {
975984
if r.Spec.Keystone.Template == nil {
976985
r.Spec.Keystone.Template = &keystonev1.KeystoneAPISpecCore{}
977986
}
978-
// Keystone only uses NotificationsBus (optional) - don't default it
987+
// Propagate top-level NotificationsBus to template if not already set
988+
// This prevents the service operator's Default() from using the deprecated field
989+
if r.Spec.Keystone.Template.NotificationsBus == nil && r.Spec.NotificationsBus != nil {
990+
r.Spec.Keystone.Template.NotificationsBus = r.Spec.NotificationsBus
991+
}
979992
r.Spec.Keystone.Template.Default()
980993
initializeOverrideSpec(&r.Spec.Keystone.APIOverride.Route, true)
981994
r.Spec.Keystone.Template.SetDefaultRouteAnnotations(r.Spec.Keystone.APIOverride.Route.Annotations)
@@ -990,6 +1003,11 @@ func (r *OpenStackControlPlane) DefaultServices() {
9901003
if r.Spec.Manila.Template.MessagingBus.Cluster == "" {
9911004
r.Spec.Manila.Template.MessagingBus.Cluster = "rabbitmq"
9921005
}
1006+
// Propagate top-level NotificationsBus to template if not already set
1007+
// This prevents the service operator's Default() from using the deprecated field
1008+
if r.Spec.Manila.Template.NotificationsBus == nil && r.Spec.NotificationsBus != nil {
1009+
r.Spec.Manila.Template.NotificationsBus = r.Spec.NotificationsBus
1010+
}
9931011
r.Spec.Manila.Template.Default()
9941012
initializeOverrideSpec(&r.Spec.Manila.APIOverride.Route, true)
9951013
r.Spec.Manila.Template.SetDefaultRouteAnnotations(r.Spec.Manila.APIOverride.Route.Annotations)
@@ -1017,6 +1035,11 @@ func (r *OpenStackControlPlane) DefaultServices() {
10171035
if r.Spec.Neutron.Template.MessagingBus.Cluster == "" {
10181036
r.Spec.Neutron.Template.MessagingBus.Cluster = "rabbitmq"
10191037
}
1038+
// Propagate top-level NotificationsBus to template if not already set
1039+
// This prevents the service operator's Default() from using the deprecated field
1040+
if r.Spec.Neutron.Template.NotificationsBus == nil && r.Spec.NotificationsBus != nil {
1041+
r.Spec.Neutron.Template.NotificationsBus = r.Spec.NotificationsBus
1042+
}
10201043
r.Spec.Neutron.Template.Default()
10211044
initializeOverrideSpec(&r.Spec.Neutron.APIOverride.Route, true)
10221045
r.Spec.Neutron.Template.SetDefaultRouteAnnotations(r.Spec.Neutron.APIOverride.Route.Annotations)
@@ -1032,6 +1055,11 @@ func (r *OpenStackControlPlane) DefaultServices() {
10321055
if r.Spec.Nova.Template.MessagingBus.Cluster == "" {
10331056
r.Spec.Nova.Template.MessagingBus.Cluster = "rabbitmq"
10341057
}
1058+
// Propagate top-level NotificationsBus to template if not already set
1059+
// This prevents the service operator's Default() from using the deprecated field
1060+
if r.Spec.Nova.Template.NotificationsBus == nil && r.Spec.NotificationsBus != nil {
1061+
r.Spec.Nova.Template.NotificationsBus = r.Spec.NotificationsBus
1062+
}
10351063
r.Spec.Nova.Template.Default()
10361064
initializeOverrideSpec(&r.Spec.Nova.APIOverride.Route, true)
10371065
r.Spec.Nova.Template.SetDefaultRouteAnnotations(r.Spec.Nova.APIOverride.Route.Annotations)
@@ -1183,6 +1211,11 @@ func (r *OpenStackControlPlane) DefaultServices() {
11831211
if r.Spec.Watcher.Template.MessagingBus.Cluster == "" {
11841212
r.Spec.Watcher.Template.MessagingBus.Cluster = "rabbitmq"
11851213
}
1214+
// Propagate top-level NotificationsBus to template if not already set
1215+
// This prevents the service operator's Default() from using the deprecated field
1216+
if r.Spec.Watcher.Template.NotificationsBus == nil && r.Spec.NotificationsBus != nil {
1217+
r.Spec.Watcher.Template.NotificationsBus = r.Spec.NotificationsBus
1218+
}
11861219
r.Spec.Watcher.Template.Default()
11871220

11881221
if r.Spec.Watcher.Enabled {

‎api/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ replace github.com/openstack-k8s-operators/designate-operator/api => github.com/
152152

153153
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/lmiccini/glance-operator/api v0.0.0-20260126082232-7d867f42a4dc
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-20260127071636-65ace65f3410
156156

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

@@ -162,10 +162,10 @@ replace github.com/openstack-k8s-operators/manila-operator/api => github.com/lmi
162162

163163
replace github.com/openstack-k8s-operators/neutron-operator/api => github.com/lmiccini/neutron-operator/api v0.0.0-20260126123412-122eb24114b3
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

167167
replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/lmiccini/octavia-operator/api v0.0.0-20260126220543-7499a1432042
168168

169169
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260126124705-8bd837c8c2e9
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-20260127143836-ec9703c7d016

‎api/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ github.com/lmiccini/designate-operator/api v0.0.0-20260126121522-86cef6d26d0a h1
9898
github.com/lmiccini/designate-operator/api v0.0.0-20260126121522-86cef6d26d0a/go.mod h1:NllEsgsxg+lGMajtk9IaVGaU5ZcQQNMxhwkLhnhl28w=
9999
github.com/lmiccini/glance-operator/api v0.0.0-20260126082232-7d867f42a4dc h1:UGlIvMGviaqeBSnCuv6nhr3DBzPbkaIEZ8qXML3d7XE=
100100
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=
101+
github.com/lmiccini/heat-operator/api v0.0.0-20260127071636-65ace65f3410 h1:Q5ggjya7z6zXtZ3h+6NQKTjEy2FSueH1nvz7Dujsn74=
102+
github.com/lmiccini/heat-operator/api v0.0.0-20260127071636-65ace65f3410/go.mod h1:T5lLlPNIJZuXRh8J1PwA1sZL3fgERGYHfisfcKZm2bI=
103103
github.com/lmiccini/ironic-operator/api v0.0.0-20260126122431-1f3ba4559582 h1:sksB1Mw6d8oVpJ8Vh6H8X/yYqJ8x+3QqMlkvml1t5Sc=
104104
github.com/lmiccini/ironic-operator/api v0.0.0-20260126122431-1f3ba4559582/go.mod h1:BbKlVhrD3sYFYsFhvG9+qPsCRygYv08Sd4M7o4n9XQQ=
105105
github.com/lmiccini/keystone-operator/api v0.0.0-20260126134229-5c4ccd648c80 h1:IRu3VJ/zCDbkebLngjmBV4jgSx6m9lcLj1rgsu4itro=
@@ -108,14 +108,14 @@ github.com/lmiccini/manila-operator/api v0.0.0-20260126132043-0c4c21f3108c h1:k9
108108
github.com/lmiccini/manila-operator/api v0.0.0-20260126132043-0c4c21f3108c/go.mod h1:LtrSM0FypW3nxiRzAlk+Dk8ZjFtCAYOl2msoXL3GAtg=
109109
github.com/lmiccini/neutron-operator/api v0.0.0-20260126123412-122eb24114b3 h1:DGEtxZeXd2RmyJDYNbYmDr7YaZWTs2yMwLUbFdjvEhM=
110110
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=
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=
113113
github.com/lmiccini/octavia-operator/api v0.0.0-20260126220543-7499a1432042 h1:Lf7khelUlsoEV8qsM2wYWZvSorhNYXEK5AF4PIpOeks=
114114
github.com/lmiccini/octavia-operator/api v0.0.0-20260126220543-7499a1432042/go.mod h1:U+xQIGQ6U3F+plwX3QTG1x/D6+tk/16h91/YbHPFRGU=
115115
github.com/lmiccini/telemetry-operator/api v0.0.0-20260126124705-8bd837c8c2e9 h1:Wno8VQ3vnpFTgRgB/qPL2THGOKouM6an68BwN48IPjs=
116116
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=
117+
github.com/lmiccini/watcher-operator/api v0.0.0-20260127143836-ec9703c7d016 h1:x46sB8LIdo45vcKY6dAzDcdAlmxNvAClS4piedy5g8Q=
118+
github.com/lmiccini/watcher-operator/api v0.0.0-20260127143836-ec9703c7d016/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=

‎bindata/crds/crds.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5064,6 +5064,16 @@ spec:
50645064
databaseInstance:
50655065
default: openstack
50665066
type: string
5067+
dbPurge:
5068+
properties:
5069+
age:
5070+
default: 30
5071+
minimum: 1
5072+
type: integer
5073+
schedule:
5074+
default: 1 0 * * *
5075+
type: string
5076+
type: object
50675077
defaultConfigOverwrite:
50685078
additionalProperties:
50695079
type: string

‎bindata/crds/heat.openstack.org_heats.yaml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,21 @@ spec:
7979
Right now required by the maridb-operator to get the credentials from the instance to create the DB.
8080
Might not be required in future.
8181
type: string
82+
dbPurge:
83+
description: DBPurge defines parameters for the database purge CronJob
84+
properties:
85+
age:
86+
default: 30
87+
description: Age is the DBPurgeAge parameter and indicates the
88+
number of days of purging DB records
89+
minimum: 1
90+
type: integer
91+
schedule:
92+
default: 1 0 * * *
93+
description: Schedule defines the crontab format string to schedule
94+
the DBPurge cronJob
95+
type: string
96+
type: object
8297
defaultConfigOverwrite:
8398
additionalProperties:
8499
type: string

‎bindata/rbac/heat-operator-rbac.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ rules:
107107
- apiGroups:
108108
- batch
109109
resources:
110+
- cronjobs
110111
- jobs
111112
verbs:
112113
- create

‎config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4799,6 +4799,16 @@ spec:
47994799
databaseInstance:
48004800
default: openstack
48014801
type: string
4802+
dbPurge:
4803+
properties:
4804+
age:
4805+
default: 30
4806+
minimum: 1
4807+
type: integer
4808+
schedule:
4809+
default: 1 0 * * *
4810+
type: string
4811+
type: object
48024812
defaultConfigOverwrite:
48034813
additionalProperties:
48044814
type: string

‎config/operator/manager_operator_images.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ spec:
2222
- name: RELATED_IMAGE_GLANCE_OPERATOR_MANAGER_IMAGE_URL
2323
value: quay.io/lmiccini/glance-operator@sha256:bc45409dff26aca6bd982684cfaf093548adb6a71928f5257fe60ab5535dda39
2424
- name: RELATED_IMAGE_HEAT_OPERATOR_MANAGER_IMAGE_URL
25-
value: quay.io/lmiccini/heat-operator@sha256:dd1b778223d83d3ea17ce52d6b749c3f89a13a4944710b090cc0ca63247fb462
25+
value: quay.io/lmiccini/heat-operator@sha256:027f3118543388d561b452a9777783b1f866ffaf59d9a1b16a225b1c5636111f
2626
- name: RELATED_IMAGE_HORIZON_OPERATOR_MANAGER_IMAGE_URL
2727
value: quay.io/openstack-k8s-operators/horizon-operator@sha256:3311e627bcb860d9443592a2c67078417318c9eb77d8ef4d07f9aa7027d46822
2828
- name: RELATED_IMAGE_INFRA_OPERATOR_MANAGER_IMAGE_URL
@@ -38,7 +38,7 @@ spec:
3838
- name: RELATED_IMAGE_NEUTRON_OPERATOR_MANAGER_IMAGE_URL
3939
value: quay.io/lmiccini/neutron-operator@sha256:14786c3a66c41213a03d6375c03209f22d439dd6e752317ddcbe21dda66bb569
4040
- name: RELATED_IMAGE_NOVA_OPERATOR_MANAGER_IMAGE_URL
41-
value: quay.io/lmiccini/nova-operator@sha256:dbde47574a2204e5cb6af468e5c74df5124b1daab0ebcb0dc8c489fa40c8942f
41+
value: quay.io/lmiccini/nova-operator@sha256:a992613466db3478a00c20c28639c4a12f6326aa52c40a418d1ec40038c83b61
4242
- name: RELATED_IMAGE_OCTAVIA_OPERATOR_MANAGER_IMAGE_URL
4343
value: quay.io/lmiccini/octavia-operator@sha256:bb8d23f38682e4b987b621a3116500a76d0dc380a1bfb9ea77f18dfacdee4f49
4444
- name: RELATED_IMAGE_OPENSTACK_BAREMETAL_OPERATOR_MANAGER_IMAGE_URL
@@ -56,4 +56,4 @@ spec:
5656
- name: RELATED_IMAGE_TEST_OPERATOR_MANAGER_IMAGE_URL
5757
value: quay.io/openstack-k8s-operators/test-operator@sha256:c8dde42dafd41026ed2e4cfc26efc0fff63c4ba9d31326ae7dc644ccceaafa9d
5858
- name: RELATED_IMAGE_WATCHER_OPERATOR_MANAGER_IMAGE_URL
59-
value: quay.io/lmiccini/watcher-operator@sha256:53ed5a94d4b8864152053b8d3c3ac0765d178c4db033fefe0ca8dab887d74922
59+
value: quay.io/lmiccini/watcher-operator@sha256:b242a833be95e9682e8cdebdd9f1a52de864dfe83df6ddc1a9dafa283e98852f

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ replace github.com/openstack-k8s-operators/designate-operator/api => github.com/
190190

191191
replace github.com/openstack-k8s-operators/glance-operator/api => github.com/lmiccini/glance-operator/api v0.0.0-20260126082232-7d867f42a4dc
192192

193-
replace github.com/openstack-k8s-operators/heat-operator/api => github.com/lmiccini/heat-operator/api v0.0.0-20260127054124-683e1784b7eb
193+
replace github.com/openstack-k8s-operators/heat-operator/api => github.com/lmiccini/heat-operator/api v0.0.0-20260127071636-65ace65f3410
194194

195195
replace github.com/openstack-k8s-operators/ironic-operator/api => github.com/lmiccini/ironic-operator/api v0.0.0-20260126122431-1f3ba4559582
196196

@@ -200,10 +200,10 @@ replace github.com/openstack-k8s-operators/manila-operator/api => github.com/lmi
200200

201201
replace github.com/openstack-k8s-operators/neutron-operator/api => github.com/lmiccini/neutron-operator/api v0.0.0-20260126123412-122eb24114b3
202202

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

205205
replace github.com/openstack-k8s-operators/octavia-operator/api => github.com/lmiccini/octavia-operator/api v0.0.0-20260126220543-7499a1432042
206206

207207
replace github.com/openstack-k8s-operators/telemetry-operator/api => github.com/lmiccini/telemetry-operator/api v0.0.0-20260126124705-8bd837c8c2e9
208208

209-
replace github.com/openstack-k8s-operators/watcher-operator/api => github.com/lmiccini/watcher-operator/api v0.0.0-20260127055809-ce41ef12e898
209+
replace github.com/openstack-k8s-operators/watcher-operator/api => github.com/lmiccini/watcher-operator/api v0.0.0-20260127143836-ec9703c7d016

0 commit comments

Comments
 (0)