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.

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

[18.0-fr1] Drop the default containerImage parameter and use VAR #336

Open
wants to merge 2 commits into
base: 18.0-fr1
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion apis/bases/instanceha.openstack.org_instancehas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ spec:
bundle file
type: string
containerImage:
default: quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified
description: ContainerImage for the the InstanceHa container (will
be set to environmental default if empty)
type: string
Expand Down
1 change: 0 additions & 1 deletion apis/instanceha/v1beta1/instanceha_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ const (
// InstanceHaSpec defines the desired state of InstanceHa
type InstanceHaSpec struct {
// +kubebuilder:validation:Required
// +kubebuilder:default="quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified"
// ContainerImage for the the InstanceHa container (will be set to environmental default if empty)
ContainerImage string `json:"containerImage"`

Expand Down
1 change: 0 additions & 1 deletion config/crd/bases/instanceha.openstack.org_instancehas.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ spec:
bundle file
type: string
containerImage:
default: quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified
description: ContainerImage for the the InstanceHa container (will
be set to environmental default if empty)
type: string
Expand Down
2 changes: 2 additions & 0 deletions config/default/manager_default_images.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ spec:
# TODO create its own container image, instead of using neutron one
- name: RELATED_IMAGE_INFRA_DNSMASQ_IMAGE_URL_DEFAULT
value: quay.io/podified-antelope-centos9/openstack-neutron-server:current-podified
- name: RELATED_IMAGE_INSTANCE_HA_IMAGE_URL_DEFAULT
value: quay.io/podified-antelope-centos9/openstack-openstackclient:current-podified
Loading