Merge pull request #1305 from dprince/drop_nova_images

openshift-merge-bot[bot] · web-flow · commit b102a94aec11 · 2025-03-02T19:33:21.000Z
Switch Nova to use *Core* spec
diff --git a/apis/bases/core.openstack.org_openstackcontrolplanes.yaml b/apis/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -8790,8 +8790,6 @@ spec:
                     type: boolean
                   template:
                     properties:
-                      apiContainerImageURL:
-                        type: string
                       apiDatabaseAccount:
                         default: nova-api
                         type: string
@@ -9361,18 +9359,12 @@ spec:
                             cellMessageBusInstance: rabbitmq-cell1
                             hasAPIAccess: true
                         type: object
-                      computeContainerImageURL:
-                        type: string
-                      conductorContainerImageURL:
-                        type: string
                       keystoneInstance:
                         default: keystone
                         type: string
                       memcachedInstance:
                         default: memcached
                         type: string
-                      metadataContainerImageURL:
-                        type: string
                       metadataServiceTemplate:
                         default:
                           enabled: true
@@ -9497,8 +9489,6 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
-                      novncproxyContainerImageURL:
-                        type: string
                       passwordSelectors:
                         default:
                           service: NovaPassword
@@ -9516,8 +9506,6 @@ spec:
                       preserveJobs:
                         default: false
                         type: boolean
-                      schedulerContainerImageURL:
-                        type: string
                       schedulerServiceTemplate:
                         default:
                           replicas: 1
@@ -9590,12 +9578,6 @@ spec:
                             type: string
                         type: object
                     required:
-                    - apiContainerImageURL
-                    - computeContainerImageURL
-                    - conductorContainerImageURL
-                    - metadataContainerImageURL
-                    - novncproxyContainerImageURL
-                    - schedulerContainerImageURL
                     - secret
                     type: object
                 type: object
diff --git a/apis/core/v1beta1/openstackcontrolplane_types.go b/apis/core/v1beta1/openstackcontrolplane_types.go
@@ -564,7 +564,7 @@ type NovaSection struct {
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// Template - Overrides to use when creating the Nova services
-	Template *novav1.NovaSpec `json:"template,omitempty"`
+	Template *novav1.NovaSpecCore `json:"template,omitempty"`
 
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
diff --git a/apis/core/v1beta1/openstackcontrolplane_webhook.go b/apis/core/v1beta1/openstackcontrolplane_webhook.go
@@ -418,7 +418,7 @@ func (r *OpenStackControlPlane) ValidateUpdateServices(old OpenStackControlPlane
 
 	if r.Spec.Nova.Enabled {
 		if old.Nova.Template == nil {
-			old.Nova.Template = &novav1.NovaSpec{}
+			old.Nova.Template = &novav1.NovaSpecCore{}
 		}
 		errors = append(errors, r.Spec.Nova.Template.ValidateUpdate(*old.Nova.Template, basePath.Child("nova").Child("template"), r.Namespace)...)
 		errors = append(errors, validateTLSOverrideSpec(&r.Spec.Nova.APIOverride.Route, basePath.Child("nova").Child("apiOverride").Child("route"))...)
@@ -836,7 +836,7 @@ func (r *OpenStackControlPlane) DefaultServices() {
 	// Nova
 	if r.Spec.Nova.Enabled || r.Spec.Nova.Template != nil {
 		if r.Spec.Nova.Template == nil {
-			r.Spec.Nova.Template = &novav1.NovaSpec{}
+			r.Spec.Nova.Template = &novav1.NovaSpecCore{}
 		}
 		r.Spec.Nova.Template.Default()
 	}
diff --git a/apis/core/v1beta1/zz_generated.deepcopy.go b/apis/core/v1beta1/zz_generated.deepcopy.go
diff --git a/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml b/config/crd/bases/core.openstack.org_openstackcontrolplanes.yaml
@@ -8790,8 +8790,6 @@ spec:
                     type: boolean
                   template:
                     properties:
-                      apiContainerImageURL:
-                        type: string
                       apiDatabaseAccount:
                         default: nova-api
                         type: string
@@ -9361,18 +9359,12 @@ spec:
                             cellMessageBusInstance: rabbitmq-cell1
                             hasAPIAccess: true
                         type: object
-                      computeContainerImageURL:
-                        type: string
-                      conductorContainerImageURL:
-                        type: string
                       keystoneInstance:
                         default: keystone
                         type: string
                       memcachedInstance:
                         default: memcached
                         type: string
-                      metadataContainerImageURL:
-                        type: string
                       metadataServiceTemplate:
                         default:
                           enabled: true
@@ -9497,8 +9489,6 @@ spec:
                         additionalProperties:
                           type: string
                         type: object
-                      novncproxyContainerImageURL:
-                        type: string
                       passwordSelectors:
                         default:
                           service: NovaPassword
@@ -9516,8 +9506,6 @@ spec:
                       preserveJobs:
                         default: false
                         type: boolean
-                      schedulerContainerImageURL:
-                        type: string
                       schedulerServiceTemplate:
                         default:
                           replicas: 1
@@ -9590,12 +9578,6 @@ spec:
                             type: string
                         type: object
                     required:
-                    - apiContainerImageURL
-                    - computeContainerImageURL
-                    - conductorContainerImageURL
-                    - metadataContainerImageURL
-                    - novncproxyContainerImageURL
-                    - schedulerContainerImageURL
                     - secret
                     type: object
                 type: object
diff --git a/pkg/openstack/nova.go b/pkg/openstack/nova.go
@@ -65,7 +65,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl
 	}
 
 	if instance.Spec.Nova.Template == nil {
-		instance.Spec.Nova.Template = &novav1.NovaSpec{}
+		instance.Spec.Nova.Template = &novav1.NovaSpecCore{}
 	}
 
 	if instance.Spec.Nova.Template.NodeSelector == nil {
@@ -346,7 +346,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl
 		// cell0 but cell0 should not have compute nodes registered. Eventually
 		// we need to support either rabbitmq vhosts or deploy a separate
 		// RabbitMQCluster per nova cell.
-		instance.Spec.Nova.Template.DeepCopyInto(&nova.Spec)
+		instance.Spec.Nova.Template.DeepCopyInto(&nova.Spec.NovaSpecCore)
 
 		nova.Spec.NovaImages.APIContainerImageURL = *version.Status.ContainerImages.NovaAPIImage
 		nova.Spec.NovaImages.NovaComputeContainerImageURL = *version.Status.ContainerImages.NovaComputeImage

Original file line number	Diff line number	Diff line change
`@@ -418,7 +418,7 @@ func (r *OpenStackControlPlane) ValidateUpdateServices(old OpenStackControlPlane`
`418`	`418`
`419`	`419`	`if r.Spec.Nova.Enabled {`
`420`	`420`	`if old.Nova.Template == nil {`
`421`		`- old.Nova.Template = &novav1.NovaSpec{}`
	`421`	`+ old.Nova.Template = &novav1.NovaSpecCore{}`
`422`	`422`	`}`
`423`	`423`	`errors = append(errors, r.Spec.Nova.Template.ValidateUpdate(*old.Nova.Template, basePath.Child("nova").Child("template"), r.Namespace)...)`
`424`	`424`	`errors = append(errors, validateTLSOverrideSpec(&r.Spec.Nova.APIOverride.Route, basePath.Child("nova").Child("apiOverride").Child("route"))...)`
`@@ -836,7 +836,7 @@ func (r *OpenStackControlPlane) DefaultServices() {`
`836`	`836`	`// Nova`
`837`	`837`	`if r.Spec.Nova.Enabled \|\| r.Spec.Nova.Template != nil {`
`838`	`838`	`if r.Spec.Nova.Template == nil {`
`839`		`- r.Spec.Nova.Template = &novav1.NovaSpec{}`
	`839`	`+ r.Spec.Nova.Template = &novav1.NovaSpecCore{}`
`840`	`840`	`}`
`841`	`841`	`r.Spec.Nova.Template.Default()`
`842`	`842`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if instance.Spec.Nova.Template == nil {`
`68`		`- instance.Spec.Nova.Template = &novav1.NovaSpec{}`
	`68`	`+ instance.Spec.Nova.Template = &novav1.NovaSpecCore{}`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`if instance.Spec.Nova.Template.NodeSelector == nil {`
`@@ -346,7 +346,7 @@ func ReconcileNova(ctx context.Context, instance *corev1beta1.OpenStackControlPl`
`346`	`346`	`// cell0 but cell0 should not have compute nodes registered. Eventually`
`347`	`347`	`// we need to support either rabbitmq vhosts or deploy a separate`
`348`	`348`	`// RabbitMQCluster per nova cell.`
`349`		`- instance.Spec.Nova.Template.DeepCopyInto(&nova.Spec)`
	`349`	`+ instance.Spec.Nova.Template.DeepCopyInto(&nova.Spec.NovaSpecCore)`
`350`	`350`
`351`	`351`	`nova.Spec.NovaImages.APIContainerImageURL = *version.Status.ContainerImages.NovaAPIImage`
`352`	`352`	`nova.Spec.NovaImages.NovaComputeContainerImageURL = *version.Status.ContainerImages.NovaComputeImage`