Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove leftover image default for nova-conductor in cell #601

Merged
merged 1 commit into from
Nov 17, 2023
Merged

Remove leftover image default for nova-conductor in cell #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions api/bases/nova.openstack.org_nova.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
1 change: 0 additions & 1 deletion api/v1beta1/novacell_types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"`

Expand Down
2 changes: 0 additions & 2 deletions config/crd/bases/nova.openstack.org_nova.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 2 additions & 0 deletions config/default/manager_default_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading