Drop the default containerImage parameter and use VAR

Let's not use the hardcoded default but rely on the RELATED_* vars. Jira: OSPRH-13093
openstack-k8s-operators · Jan 17, 2025 · a71a68e · a71a68e
1 parent d64688c
commit a71a68e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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