Skip to content

Commit 6593e40

Browse files
openshift-merge-bot[bot]openshift-merge-bot[bot]
authored
Merge pull request #1312 from fmount/nova_toporef
Bump nova-operator to support topology
2 parents c1e65b1 + 3b4c4f5 commit 6593e40

20 files changed

Lines changed: 674 additions & 24 deletions

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

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8921,6 +8921,13 @@ spec:
89218921
caBundleSecretName:
89228922
type: string
89238923
type: object
8924+
topologyRef:
8925+
properties:
8926+
name:
8927+
type: string
8928+
namespace:
8929+
type: string
8930+
type: object
89248931
type: object
89258932
apiTimeout:
89268933
default: 60
@@ -8986,6 +8993,13 @@ spec:
89868993
x-kubernetes-int-or-string: true
89878994
type: object
89888995
type: object
8996+
topologyRef:
8997+
properties:
8998+
name:
8999+
type: string
9000+
namespace:
9001+
type: string
9002+
type: object
89899003
type: object
89909004
dbPurge:
89919005
properties:
@@ -9115,6 +9129,13 @@ spec:
91159129
secretName:
91169130
type: string
91179131
type: object
9132+
topologyRef:
9133+
properties:
9134+
name:
9135+
type: string
9136+
namespace:
9137+
type: string
9138+
type: object
91189139
type: object
91199140
noVNCProxyServiceTemplate:
91209141
properties:
@@ -9232,6 +9253,13 @@ spec:
92329253
type: string
92339254
type: object
92349255
type: object
9256+
topologyRef:
9257+
properties:
9258+
name:
9259+
type: string
9260+
namespace:
9261+
type: string
9262+
type: object
92359263
type: object
92369264
nodeSelector:
92379265
additionalProperties:
@@ -9296,10 +9324,24 @@ spec:
92969324
x-kubernetes-int-or-string: true
92979325
type: object
92989326
type: object
9327+
topologyRef:
9328+
properties:
9329+
name:
9330+
type: string
9331+
namespace:
9332+
type: string
9333+
type: object
92999334
required:
93009335
- computeDriver
93019336
type: object
93029337
type: object
9338+
topologyRef:
9339+
properties:
9340+
name:
9341+
type: string
9342+
namespace:
9343+
type: string
9344+
type: object
93039345
required:
93049346
- cellDatabaseAccount
93059347
- hasAPIAccess
@@ -9438,6 +9480,13 @@ spec:
94389480
secretName:
94399481
type: string
94409482
type: object
9483+
topologyRef:
9484+
properties:
9485+
name:
9486+
type: string
9487+
namespace:
9488+
type: string
9489+
type: object
94419490
type: object
94429491
nodeSelector:
94439492
additionalProperties:
@@ -9515,12 +9564,26 @@ spec:
95159564
x-kubernetes-int-or-string: true
95169565
type: object
95179566
type: object
9567+
topologyRef:
9568+
properties:
9569+
name:
9570+
type: string
9571+
namespace:
9572+
type: string
9573+
type: object
95189574
type: object
95199575
secret:
95209576
type: string
95219577
serviceUser:
95229578
default: nova
95239579
type: string
9580+
topologyRef:
9581+
properties:
9582+
name:
9583+
type: string
9584+
namespace:
9585+
type: string
9586+
type: object
95249587
required:
95259588
- apiContainerImageURL
95269589
- computeContainerImageURL

‎apis/core/v1beta1/openstackcontrolplane_webhook.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ func (r *OpenStackControlPlane) ValidateCreateServices(basePath *field.Path) (ad
254254
}
255255

256256
if r.Spec.Nova.Enabled {
257-
errors = append(errors, r.Spec.Nova.Template.ValidateCreate(basePath.Child("nova").Child("template"))...)
257+
errors = append(errors, r.Spec.Nova.Template.ValidateCreate(basePath.Child("nova").Child("template"), r.Namespace)...)
258258
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Nova.APIOverride.Route, basePath.Child("nova").Child("apiOverride").Child("route"))...)
259259
}
260260

@@ -405,7 +405,7 @@ func (r *OpenStackControlPlane) ValidateUpdateServices(old OpenStackControlPlane
405405
if old.Nova.Template == nil {
406406
old.Nova.Template = &novav1.NovaSpec{}
407407
}
408-
errors = append(errors, r.Spec.Nova.Template.ValidateUpdate(*old.Nova.Template, basePath.Child("nova").Child("template"))...)
408+
errors = append(errors, r.Spec.Nova.Template.ValidateUpdate(*old.Nova.Template, basePath.Child("nova").Child("template"), r.Namespace)...)
409409
errors = append(errors, validateTLSOverrideSpec(&r.Spec.Nova.APIOverride.Route, basePath.Child("nova").Child("apiOverride").Child("route"))...)
410410
}
411411

‎apis/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ require (
1313
github.com/openstack-k8s-operators/glance-operator/api v0.5.1-0.20250224115614-90f4be40dbe8
1414
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20250225040412-85d27d3c6729
1515
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20250225012432-71eddeaa4e91
16-
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250224135717-7d751fb24aaa
16+
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250226120707-ee102640a845
1717
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20250224101430-49ab890b73aa
1818
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250224101200-743a4b3fb404
19-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225091304-b66d960fb024
19+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f
2020
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250224130558-eb5a5d85bfdb
2121
github.com/openstack-k8s-operators/manila-operator/api v0.5.1-0.20250224103102-19721ac4f257
2222
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250224101716-b42af3d653ba
2323
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250224121612-3a76df1432c8
24-
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250224221812-f1ecac7a3eee
24+
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250226193946-9c6c30c7718e
2525
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250224125936-003d70aa4d9a
2626
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250225064626-1d6b34a75b72
2727
github.com/openstack-k8s-operators/ovn-operator/api v0.5.1-0.20250224101201-53811064bfea

‎apis/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,14 +106,14 @@ github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20250225040412-85d
106106
github.com/openstack-k8s-operators/heat-operator/api v0.5.1-0.20250225040412-85d27d3c6729/go.mod h1:yVcfYmV1vtruOm/lFjGnxX/4+w1AwNv+gEFUx1J6hH0=
107107
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20250225012432-71eddeaa4e91 h1:1lv/EMRnk5O7171XhCb6b+FmWivyIUPCFGcVkoZfIsc=
108108
github.com/openstack-k8s-operators/horizon-operator/api v0.5.1-0.20250225012432-71eddeaa4e91/go.mod h1:HMCCmdEsVgCqSZxL6UWGHBJzSL+9GRfiZSGNjLj/X+g=
109-
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250224135717-7d751fb24aaa h1:GLNquoLECp7//ZaaLGkieyVcYMHKUZnyEeXzgIdPpsU=
110-
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250224135717-7d751fb24aaa/go.mod h1:kkjcOSZ7jkHbVzxJd0nDQzjB+vqafuAMgSf7AnEXydw=
109+
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250226120707-ee102640a845 h1:18Si6z23Spv94fEkJZRC3Pzjk6UmkzzaiVdaqoAVc3o=
110+
github.com/openstack-k8s-operators/infra-operator/apis v0.5.1-0.20250226120707-ee102640a845/go.mod h1:jZ74v7V5JcKjSIgGWyrunPVMTuyw6SBBfp7f74RDrSo=
111111
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20250224101430-49ab890b73aa h1:4A1jzuAZiLIJaWYACURNTl7fLfJWVOKl9mqyzlKemuA=
112112
github.com/openstack-k8s-operators/ironic-operator/api v0.5.1-0.20250224101430-49ab890b73aa/go.mod h1:RVw7vZ5jCP/U+pCNyDW+AhxKG71K/YTEcmKQLwsf5rE=
113113
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250224101200-743a4b3fb404 h1:JXQ0ynvopsRhXLpXQGFhs0cFByH/2dGwBt0RynKYShI=
114114
github.com/openstack-k8s-operators/keystone-operator/api v0.5.1-0.20250224101200-743a4b3fb404/go.mod h1:5i9OcPG3dNqjmIz4yhZCua2cLlFkDDLfnYQNKlSY8eo=
115-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225091304-b66d960fb024 h1:lus1OWfnh5QTsTqb+pOKt4EEtxh9jonz43Gf+O+DVY8=
116-
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225091304-b66d960fb024/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
115+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f h1:3JVxp1FhQw62xYc/tnA04uPn9WCUTYupWucRQJeTy54=
116+
github.com/openstack-k8s-operators/lib-common/modules/common v0.5.1-0.20250225220922-3ead38b7284f/go.mod h1:rgpcv2tLD+/vudXx/gpIQSTuRpk4GOxHx84xwfvQalM=
117117
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250211124440-b44f6585b825 h1:694o/EWFvhr10DVkrpwSxIcJZfiyR0BDhhItiDDhHSw=
118118
github.com/openstack-k8s-operators/lib-common/modules/openstack v0.5.1-0.20250211124440-b44f6585b825/go.mod h1:kAOWCEejXeH4H+oza2z2AeYvEFT3Wf2Mz10rvPv/V+M=
119119
github.com/openstack-k8s-operators/lib-common/modules/storage v0.5.1-0.20250224130558-eb5a5d85bfdb h1:p0aI7lBEKF0FmP3fu0i88kr6TCKy4JBxKWgsmmEoSVY=
@@ -124,8 +124,8 @@ github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250224101716-
124124
github.com/openstack-k8s-operators/mariadb-operator/api v0.5.1-0.20250224101716-b42af3d653ba/go.mod h1:scq8sQVU0kC35CPXLMU1I0Jo+nHQt0qG4NCVLsZbS2E=
125125
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250224121612-3a76df1432c8 h1:kVSBJN1GNLA6Bq4+e0SUeoWf+iXxfh3XpCX/Xs0K0Hg=
126126
github.com/openstack-k8s-operators/neutron-operator/api v0.5.1-0.20250224121612-3a76df1432c8/go.mod h1:SqF4i2yOqA75fXPAGH34cORhX6NhCNT3xd19sBuIjVY=
127-
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250224221812-f1ecac7a3eee h1:P78bzTjoqK/buFZWdKv7NNeiciEUsnhSsxmtySyRinI=
128-
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250224221812-f1ecac7a3eee/go.mod h1:ouAtrBGah0l8hhuJanSqVtRUXH2SUMzsr0x9SGDh9ek=
127+
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250226193946-9c6c30c7718e h1:dWHABFILwbetMpRFi/fTzEWDJpIDDLVNRsvm0pR5sBI=
128+
github.com/openstack-k8s-operators/nova-operator/api v0.5.1-0.20250226193946-9c6c30c7718e/go.mod h1:RAaFThrIF4ry2bg/x0dZSCHCKqlzf5hagWFTNOzY1ic=
129129
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250224125936-003d70aa4d9a h1:MeAOrp+eoyj7lx5KE3aXvMdIkv609tpBpYd6A13hbnk=
130130
github.com/openstack-k8s-operators/octavia-operator/api v0.5.1-0.20250224125936-003d70aa4d9a/go.mod h1:NqPPuPxBgiJiI9TXnUcqV7k/HsbVzuaCPw8uHO4qzgo=
131131
github.com/openstack-k8s-operators/openstack-baremetal-operator/api v0.5.1-0.20250225064626-1d6b34a75b72 h1:mBuPlG98nzW3zqTTALgmUBrQFnbPYBprrVZdEqmSB4o=

‎bindata/crds/crds.yaml‎

Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9085,6 +9085,13 @@ spec:
90859085
caBundleSecretName:
90869086
type: string
90879087
type: object
9088+
topologyRef:
9089+
properties:
9090+
name:
9091+
type: string
9092+
namespace:
9093+
type: string
9094+
type: object
90889095
type: object
90899096
apiTimeout:
90909097
default: 60
@@ -9150,6 +9157,13 @@ spec:
91509157
x-kubernetes-int-or-string: true
91519158
type: object
91529159
type: object
9160+
topologyRef:
9161+
properties:
9162+
name:
9163+
type: string
9164+
namespace:
9165+
type: string
9166+
type: object
91539167
type: object
91549168
dbPurge:
91559169
properties:
@@ -9279,6 +9293,13 @@ spec:
92799293
secretName:
92809294
type: string
92819295
type: object
9296+
topologyRef:
9297+
properties:
9298+
name:
9299+
type: string
9300+
namespace:
9301+
type: string
9302+
type: object
92829303
type: object
92839304
noVNCProxyServiceTemplate:
92849305
properties:
@@ -9396,6 +9417,13 @@ spec:
93969417
type: string
93979418
type: object
93989419
type: object
9420+
topologyRef:
9421+
properties:
9422+
name:
9423+
type: string
9424+
namespace:
9425+
type: string
9426+
type: object
93999427
type: object
94009428
nodeSelector:
94019429
additionalProperties:
@@ -9460,10 +9488,24 @@ spec:
94609488
x-kubernetes-int-or-string: true
94619489
type: object
94629490
type: object
9491+
topologyRef:
9492+
properties:
9493+
name:
9494+
type: string
9495+
namespace:
9496+
type: string
9497+
type: object
94639498
required:
94649499
- computeDriver
94659500
type: object
94669501
type: object
9502+
topologyRef:
9503+
properties:
9504+
name:
9505+
type: string
9506+
namespace:
9507+
type: string
9508+
type: object
94679509
required:
94689510
- cellDatabaseAccount
94699511
- hasAPIAccess
@@ -9602,6 +9644,13 @@ spec:
96029644
secretName:
96039645
type: string
96049646
type: object
9647+
topologyRef:
9648+
properties:
9649+
name:
9650+
type: string
9651+
namespace:
9652+
type: string
9653+
type: object
96059654
type: object
96069655
nodeSelector:
96079656
additionalProperties:
@@ -9679,12 +9728,26 @@ spec:
96799728
x-kubernetes-int-or-string: true
96809729
type: object
96819730
type: object
9731+
topologyRef:
9732+
properties:
9733+
name:
9734+
type: string
9735+
namespace:
9736+
type: string
9737+
type: object
96829738
type: object
96839739
secret:
96849740
type: string
96859741
serviceUser:
96869742
default: nova
96879743
type: string
9744+
topologyRef:
9745+
properties:
9746+
name:
9747+
type: string
9748+
namespace:
9749+
type: string
9750+
type: object
96889751
required:
96899752
- apiContainerImageURL
96909753
- computeContainerImageURL

‎bindata/crds/network.openstack.org_dnsmasqs.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -199,6 +199,7 @@ spec:
199199
items:
200200
type: string
201201
type: array
202+
x-kubernetes-list-type: atomic
202203
sessionAffinity:
203204
description: |-
204205
Supports "ClientIP" and "None". Used to maintain session affinity.

0 commit comments

Comments
 (0)