From ca27fed437540af5f1af49009898a139191446da Mon Sep 17 00:00:00 2001 From: Luca Miccini Date: Thu, 16 Jan 2025 16:51:41 +0100 Subject: [PATCH 1/2] Drop the default containerImage parameter and use VAR Let's not use the hardcoded default but rely on the RELATED_* vars. Jira: OSPRH-13093 --- apis/bases/instanceha.openstack.org_instancehas.yaml | 1 - apis/instanceha/v1beta1/instanceha_types.go | 1 - config/crd/bases/instanceha.openstack.org_instancehas.yaml | 1 - config/default/manager_default_images.yaml | 2 ++ .../bases/infra-operator.clusterserviceversion.yaml | 5 +++++ 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/apis/bases/instanceha.openstack.org_instancehas.yaml b/apis/bases/instanceha.openstack.org_instancehas.yaml index 81a23d8b..a4548714 100644 --- a/apis/bases/instanceha.openstack.org_instancehas.yaml +++ b/apis/bases/instanceha.openstack.org_instancehas.yaml @@ -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 diff --git a/apis/instanceha/v1beta1/instanceha_types.go b/apis/instanceha/v1beta1/instanceha_types.go index 2af89735..13cbb852 100644 --- a/apis/instanceha/v1beta1/instanceha_types.go +++ b/apis/instanceha/v1beta1/instanceha_types.go @@ -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"` diff --git a/config/crd/bases/instanceha.openstack.org_instancehas.yaml b/config/crd/bases/instanceha.openstack.org_instancehas.yaml index 81a23d8b..a4548714 100644 --- a/config/crd/bases/instanceha.openstack.org_instancehas.yaml +++ b/config/crd/bases/instanceha.openstack.org_instancehas.yaml @@ -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 diff --git a/config/default/manager_default_images.yaml b/config/default/manager_default_images.yaml index 39bae455..669cf183 100644 --- a/config/default/manager_default_images.yaml +++ b/config/default/manager_default_images.yaml @@ -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 diff --git a/config/manifests/bases/infra-operator.clusterserviceversion.yaml b/config/manifests/bases/infra-operator.clusterserviceversion.yaml index 83464de1..0fe6c3f2 100644 --- a/config/manifests/bases/infra-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/infra-operator.clusterserviceversion.yaml @@ -18,6 +18,11 @@ spec: apiservicedefinitions: {} customresourcedefinitions: owned: + - description: BGPConfiguration is the Schema for the bgpconfigurations API + displayName: BGPConfiguration + kind: BGPConfiguration + name: bgpconfigurations.network.openstack.org + version: v1beta1 - description: DNSData is the Schema for the dnsdata API displayName: DNSData kind: DNSData From d52fd6804cb6e30e958b9870e53fe5bf299a4a92 Mon Sep 17 00:00:00 2001 From: Luca Miccini Date: Fri, 17 Jan 2025 15:20:20 +0100 Subject: [PATCH 2/2] Update infra-operator.clusterserviceversion.yaml --- .../bases/infra-operator.clusterserviceversion.yaml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config/manifests/bases/infra-operator.clusterserviceversion.yaml b/config/manifests/bases/infra-operator.clusterserviceversion.yaml index 0fe6c3f2..83464de1 100644 --- a/config/manifests/bases/infra-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/infra-operator.clusterserviceversion.yaml @@ -18,11 +18,6 @@ spec: apiservicedefinitions: {} customresourcedefinitions: owned: - - description: BGPConfiguration is the Schema for the bgpconfigurations API - displayName: BGPConfiguration - kind: BGPConfiguration - name: bgpconfigurations.network.openstack.org - version: v1beta1 - description: DNSData is the Schema for the dnsdata API displayName: DNSData kind: DNSData