From 4b7e24331fa28cc8b3e3416a9fc36658cea3ced9 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Thu, 20 Aug 2026 14:34:13 -0400 Subject: [PATCH] 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: https://github.com/openstack-k8s-operators/s2i-openstack-containers/pull/76 This change sets the environment variable for Heat CFN API to the same value as API. Jira: OSPRH-35158 Signed-off-by: James Slagle --- config/operator/default_images.yaml | 2 +- hack/export_related_images.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/operator/default_images.yaml b/config/operator/default_images.yaml index 198412fb6..1a6d42356 100644 --- a/config/operator/default_images.yaml +++ b/config/operator/default_images.yaml @@ -98,7 +98,7 @@ spec: - 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 + value: quay.io/podified-antelope-centos9/openstack-heat-api: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 diff --git a/hack/export_related_images.sh b/hack/export_related_images.sh index e3ef5be8b..c5a06c985 100755 --- a/hack/export_related_images.sh +++ b/hack/export_related_images.sh @@ -53,7 +53,7 @@ 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_CFNAPI_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-heat-api: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