From 5c7ac56440df2521f28c0b25c235a8dc66ea8291 Mon Sep 17 00:00:00 2001 From: Kamil Sambor Date: Fri, 17 Nov 2023 10:55:04 +0100 Subject: [PATCH] Remove leftover image default for nova-conductor in cell --- api/bases/nova.openstack.org_nova.yaml | 2 -- api/v1beta1/novacell_types.go | 1 - config/crd/bases/nova.openstack.org_nova.yaml | 2 -- config/default/manager_default_images.yaml | 2 ++ 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/api/bases/nova.openstack.org_nova.yaml b/api/bases/nova.openstack.org_nova.yaml index 570957435..6fefa0194 100644 --- a/api/bases/nova.openstack.org_nova.yaml +++ b/api/bases/nova.openstack.org_nova.yaml @@ -350,8 +350,6 @@ spec: unused. type: string conductorServiceTemplate: - default: - containerImage: quay.io/podified-antelope-centos9/openstack-nova-conductor:current-podified description: ConductorServiceTemplate - defines the cell conductor deployment for the cell. properties: diff --git a/api/v1beta1/novacell_types.go b/api/v1beta1/novacell_types.go index 352a0fe70..1a54a5b7f 100644 --- a/api/v1beta1/novacell_types.go +++ b/api/v1beta1/novacell_types.go @@ -59,7 +59,6 @@ type NovaCellTemplate struct { NodeSelector map[string]string `json:"nodeSelector,omitempty"` // +kubebuilder:validation:Optional - // +kubebuilder:default={containerImage: "quay.io/podified-antelope-centos9/openstack-nova-conductor:current-podified"} // ConductorServiceTemplate - defines the cell conductor deployment for the cell. ConductorServiceTemplate NovaConductorTemplate `json:"conductorServiceTemplate"` diff --git a/config/crd/bases/nova.openstack.org_nova.yaml b/config/crd/bases/nova.openstack.org_nova.yaml index 570957435..6fefa0194 100644 --- a/config/crd/bases/nova.openstack.org_nova.yaml +++ b/config/crd/bases/nova.openstack.org_nova.yaml @@ -350,8 +350,6 @@ spec: unused. type: string conductorServiceTemplate: - default: - containerImage: quay.io/podified-antelope-centos9/openstack-nova-conductor:current-podified description: ConductorServiceTemplate - defines the cell conductor deployment for the cell. properties: diff --git a/config/default/manager_default_images.yaml b/config/default/manager_default_images.yaml index 1c98fc6c2..ca7c4e4e9 100644 --- a/config/default/manager_default_images.yaml +++ b/config/default/manager_default_images.yaml @@ -21,3 +21,5 @@ spec: value: quay.io/podified-antelope-centos9/openstack-nova-scheduler:current-podified - name: RELATED_IMAGE_NOVA_COMPUTE_IMAGE_URL_DEFAULT value: quay.io/podified-antelope-centos9/openstack-nova-compute:current-podified + - name: RELATED_IMAGE_NOVA_METADATA_IMAGE_URL_DEFAULT + value: quay.io/podified-antelope-centos9/openstack-nova-api:current-podified