Skip to content

fix(ci): derive catalog index image dynamically from branch #5122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jonkoops wants to merge 3 commits into
base: main
Choose a base branch
from
+9 −21
Open

fix(ci): derive catalog index image dynamically from branch #5122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
558f987
fix(ci): derive catalog index image dynamically from branch
jonkoops Jul 16, 2026
389b3f9
Merge branch 'main' into chore/dynamic-catalog-index-resolution
nickboldt Jul 24, 2026
398c903
Merge branch 'main' into chore/dynamic-catalog-index-resolution
nickboldt Jul 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions .ci/pipelines/env_variables.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 0 additions & 6 deletions .ci/pipelines/value_files/values_showcase-rbac.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`).
Expand Down
6 changes: 0 additions & 6 deletions .ci/pipelines/value_files/values_showcase.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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`).
Expand Down
Loading