Heat S2I: Consolidate CFN API into API image

A separate image for Heat CFN API is no longer being built after Heat
has transitioned to source2image:
openstack-k8s-operators/s2i-openstack-containers#76

This change drops the related environment variables.

Jira: OSPRH-35158
Signed-off-by: James Slagle <jslagle@redhat.com>

Author: slagle

config/operator/default_images.yaml

@@ -97,8 +97,6 @@ spec:
           value: quay.io/podified-antelope-centos9/openstack-glance-api:current-podified
         - name: RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-heat-api:current-podified
-        - name: RELATED_IMAGE_HEAT_CFNAPI_IMAGE_URL_DEFAULT
-          value: quay.io/podified-antelope-centos9/openstack-heat-api-cfn:current-podified
         - name: RELATED_IMAGE_HEAT_ENGINE_IMAGE_URL_DEFAULT
           value: quay.io/podified-antelope-centos9/openstack-heat-engine:current-podified
         - name: RELATED_IMAGE_HORIZON_IMAGE_URL_DEFAULT

hack/export_related_images.sh

@@ -53,7 +53,6 @@ export RELATED_IMAGE_CINDER_SCHEDULER_IMAGE_URL_DEFAULT=quay.io/podified-antelop
 export RELATED_IMAGE_CINDER_VOLUME_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-cinder-volume:current-podified
 export RELATED_IMAGE_HORIZON_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-horizon:current-podified
 export RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-heat-api:current-podified
-export RELATED_IMAGE_HEAT_CFNAPI_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-heat-api-cfn:current-podified
 export RELATED_IMAGE_HEAT_ENGINE_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-heat-engine:current-podified
 export RELATED_IMAGE_SWIFT_PROXY_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-swift-proxy-server:current-podified
 export RELATED_IMAGE_SWIFT_ACCOUNT_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-swift-account:current-podified

internal/openstack/version.go

@@ -67,6 +67,10 @@ func InitializeOpenStackVersionImageDefaults(ctx context.Context, envImages map[
 	if envImages["RELATED_IMAGE_NEUTRON_API_IMAGE_URL_DEFAULT"] != nil {
 		defaults.InfraDnsmasqImage = envImages["RELATED_IMAGE_NEUTRON_API_IMAGE_URL_DEFAULT"]
 	}
+	// Heat CFN API uses the same image as Heat API
+	if envImages["RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFUALT"] != nil {
+		defaults.HeatCfnapiImage = envImages["RELATED_IMAGE_HEAT_API_IMAGE_URL_DEFAULT"]
+	}
 	// custom TEST_ images which aren't released downstream
 	if envImages["TEST_TOBIKO_IMAGE_URL_DEFAULT"] != nil {
 		defaults.TestTobikoImage = envImages["TEST_TOBIKO_IMAGE_URL_DEFAULT"]