Fix EDPM $RELATED_IMAGE* vars for consistency

Fixes the EDPM environment variables to match the naming convention from the other operators for consistency. - Drops OPENSTACK from the names - Each vars ends in IMAGE_URL_DEFAULT Syncs openstack-operator with the changes done in dataplane-operator commit 6b307a874617acb1585d5acc09c2f04e47e17fa7 Signed-off-by: James Slagle <[email protected]>
openstack-k8s-operators · Apr 11, 2024 · 0fcf5cb · 0fcf5cb
1 parent 1a8cb4c
commit 0fcf5cb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 19 deletions.
diff --git a/hack/export_related_images.sh b/hack/export_related_images.sh
@@ -70,14 +70,13 @@ export RELATED_IMAGE_DESIGNATE_UNBOUND_IMAGE_URL_DEFAULT=quay.io/tripleowallabyc
 export RELATED_IMAGE_BARBICAN_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-api:current-podified
 export RELATED_IMAGE_BARBICAN_WORKER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-worker:current-podified
 export RELATED_IMAGE_BARBICAN_KEYSTONE_LISTENER_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-barbican-keystone-listener:current-podified
-export RELATED_IMAGE_OPENSTACK_EDPM_FRR_DEFAULT_IMG=quay.io/podified-antelope-centos9/openstack-frr:current-podified
-export RELATED_IMAGE_OPENSTACK_EDPM_ISCSID_DEFAULT_IMG=quay.io/podified-antelope-centos9/openstack-iscsid:current-podified
-export RELATED_IMAGE_OPENSTACK_EDPM_LOGROTATE_CROND_DEFAULT_IMG=quay.io/podified-antelope-centos9/openstack-cron:current-podified
-export RELATED_IMAGE_OPENSTACK_EDPM_MULTIPATHD_IMG=quay.io/podified-antelope-centos9/openstack-multipathd:current-podified
-export RELATED_IMAGE_OPENSTACK_EDPM_NEUTRON_METADATA_AGENT_DEFAULT_IMG=quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified
-export RELATED_IMAGE_OPENSTACK_EDPM_NEUTRON_SRIOV_AGENT_DEFAULT_IMG=quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified
-export RELATED_IMAGE_OPENSTACK_EDPM_OVN_BGP_AGENT_IMAGE=quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified
-export RELATED_IMAGE_OPENSTACK_EDPM_CEILOMETER_COMPUTE_IMAGE=quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified
-export RELATED_IMAGE_OPENSTACK_EDPM_CEILOMETER_IPMI_IMAGE=quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified
-#NOTE: RELATED_IMAGE_OPENSTACK_EDPM_NODE_EXPORTER_IMAGE is the same as below
+export RELATED_IMAGE_EDPM_FRR_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-frr:current-podified
+export RELATED_IMAGE_EDPM_ISCSID_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-iscsid:current-podified
+export RELATED_IMAGE_EDPM_LOGROTATE_CROND_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cron:current-podified
+export RELATED_IMAGE_EDPM_MULTIPATHD_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-multipathd:current-podified
+export RELATED_IMAGE_EDPM_NEUTRON_METADATA_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-metadata-agent-ovn:current-podified
+export RELATED_IMAGE_EDPM_NEUTRON_SRIOV_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-neutron-sriov-agent:current-podified
+export RELATED_IMAGE_EDPM_OVN_BGP_AGENT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ovn-bgp-agent:current-podified
+export RELATED_IMAGE_EDPM_CEILOMETER_COMPUTE_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-compute:current-podified
+export RELATED_IMAGE_EDPM_CEILOMETER_IPMI_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ceilometer-ipmi:current-podified
 export RELATED_IMAGE_TELEMETRY_NODE_EXPORTER_IMAGE_URL_DEFAULT=quay.io/prometheus/node-exporter:v1.5.0
diff --git a/pkg/openstack/version.go b/pkg/openstack/version.go
@@ -39,15 +39,6 @@ func InitializeOpenStackVersionImageDefaults(ctx context.Context, envImages map[
 			}
 			// format API so we adhere to go linting standards
 			fieldName = strings.Replace(fieldName, "Api", "API", -1)
-			// EDPM variables have OPENSTACK prefixes we drop
-			if strings.Contains(fieldName, "Edpm") {
-				fieldName = strings.Replace(fieldName, "Openstack", "", -1)
-				fieldName += "Image"
-			}
-			// FIXME: RELATED_IMAGE_OPENSTACK_EDPM_OVN_BGP_AGENT_IMAGE is inconsistent with other EDPM image names
-			if fieldName == "EdpmOvnBgpImage" {
-				fieldName = "EdpmOvnBgpAgentImage"
-			}
 		}
 		Log.Info(fmt.Sprintf("Initialize Field name: %s", fieldName))
 		field := d.FieldByName(fieldName)