From 558f987a4b782600ea3d257d8dd9e0b485a0302b Mon Sep 17 00:00:00 2001
From: Jon Koops <jonkoops@gmail.com>
Date: Thu, 16 Jul 2026 16:25:26 +0200
Subject: [PATCH] fix(ci): derive catalog index image dynamically from branch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Populate CATALOG_INDEX_IMAGE with a default based on RELEASE_VERSION
so CI always uses the correct catalog index without hardcoding.

Remove the stale catalogIndex blocks from the Helm values files — the
--set flags from helm::get_image_params() now always take effect and
override anything in the values file anyway.

Refs: RHIDP-14348
Signed-off-by: Jon Koops <jonkoops@gmail.com>
---
 .ci/pipelines/env_variables.sh                 | 18 +++++++++---------
 .../value_files/values_showcase-rbac.yaml      |  6 ------
 .ci/pipelines/value_files/values_showcase.yaml |  6 ------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/.ci/pipelines/env_variables.sh b/.ci/pipelines/env_variables.sh
index f417ccd166..e21cbb6c66 100755
--- a/.ci/pipelines/env_variables.sh
+++ b/.ci/pipelines/env_variables.sh
@@ -56,17 +56,17 @@ IMAGE_REPO="${IMAGE_REPO:-${QUAY_REPO:-rhdh-community/rhdh}}"
 QUAY_REPO="${IMAGE_REPO}" # Keep QUAY_REPO in sync for backward compatibility
 
 # Catalog index image reference.
+# Defaults to quay.io/rhdh/plugin-catalog-index tagged with RELEASE_VERSION so that
+# main uses :next and release branches (e.g., release-1.10) use :1.10 automatically.
 # Override via Gangway for RC (e.g., --catalog-index-image quay.io/rhdh/plugin-catalog-index:1.9-60) or
 # GA verification (e.g., --catalog-index-image registry.access.redhat.com/rhdh/plugin-catalog-index:1.9.4).
-CATALOG_INDEX_IMAGE="${CATALOG_INDEX_IMAGE:-}"
-if [[ -n "${CATALOG_INDEX_IMAGE}" ]]; then
-  # Derived components for Helm chart (requires separate registry/repository/tag)
-  CATALOG_INDEX_TAG="${CATALOG_INDEX_IMAGE##*:}"
-  _CI_WITHOUT_TAG="${CATALOG_INDEX_IMAGE%:*}"
-  CATALOG_INDEX_REGISTRY="${_CI_WITHOUT_TAG%%/*}"
-  CATALOG_INDEX_REPO="${_CI_WITHOUT_TAG#*/}"
-  unset _CI_WITHOUT_TAG
-fi
+CATALOG_INDEX_IMAGE="${CATALOG_INDEX_IMAGE:-quay.io/rhdh/plugin-catalog-index:${RELEASE_VERSION}}"
+# Derived components for Helm chart (requires separate registry/repository/tag)
+CATALOG_INDEX_TAG="${CATALOG_INDEX_IMAGE##*:}"
+_CI_WITHOUT_TAG="${CATALOG_INDEX_IMAGE%:*}"
+CATALOG_INDEX_REGISTRY="${_CI_WITHOUT_TAG%%/*}"
+CATALOG_INDEX_REPO="${_CI_WITHOUT_TAG#*/}"
+unset _CI_WITHOUT_TAG
 
 # =============================================================================
 # Release and Namespace Configuration
diff --git a/.ci/pipelines/value_files/values_showcase-rbac.yaml b/.ci/pipelines/value_files/values_showcase-rbac.yaml
index 35902f028c..fae3f37079 100644
--- a/.ci/pipelines/value_files/values_showcase-rbac.yaml
+++ b/.ci/pipelines/value_files/values_showcase-rbac.yaml
@@ -1,10 +1,4 @@
 global:
-  # use the latest catalog index
-  catalogIndex:
-    image:
-      registry: quay.io
-      repository: rhdh/plugin-catalog-index
-      tag: "1.10"
   dynamic:
     # -- Array of YAML files listing dynamic plugins to include with those listed in the `plugins` field.
     # Relative paths are resolved from the working directory of the initContainer that will install the plugins (`/opt/app-root/src`).
diff --git a/.ci/pipelines/value_files/values_showcase.yaml b/.ci/pipelines/value_files/values_showcase.yaml
index 8704c69dcd..888d8dcfa9 100644
--- a/.ci/pipelines/value_files/values_showcase.yaml
+++ b/.ci/pipelines/value_files/values_showcase.yaml
@@ -1,10 +1,4 @@
 global:
-  # use the latest catalog index
-  catalogIndex:
-    image:
-      registry: quay.io
-      repository: rhdh/plugin-catalog-index
-      tag: "1.10"
   dynamic:
     # -- Array of YAML files listing dynamic plugins to include with those listed in the `plugins` field.
     # Relative paths are resolved from the working directory of the initContainer that will install the plugins (`/opt/app-root/src`).