Skip to content

feat(rhdh): align disconnected CATALOG_INDEX_IMAGE as single Gangway override #81128

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
zdrapela wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(rhdh): align disconnected CATALOG_INDEX_IMAGE as single Gangway override #81128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 5 additions & 15 deletions ...helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-commands.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,9 @@ TAG_NAME=""
IMAGE_REPO=""
IMAGE_REGISTRY="quay.io"
QUAY_REPO=""
CATALOG_INDEX_REGISTRY=""
CATALOG_INDEX_REPO=""
CATALOG_INDEX_TAG=""
CATALOG_INDEX_IMAGE=""
CHART_VERSION=""
export GITHUB_ORG_NAME GITHUB_REPOSITORY_NAME RELEASE_BRANCH_NAME GIT_PR_NUMBER TAG_NAME IMAGE_REPO IMAGE_REGISTRY QUAY_REPO CATALOG_INDEX_REGISTRY CATALOG_INDEX_REPO CATALOG_INDEX_TAG CHART_VERSION
export GITHUB_ORG_NAME GITHUB_REPOSITORY_NAME RELEASE_BRANCH_NAME GIT_PR_NUMBER TAG_NAME IMAGE_REPO IMAGE_REGISTRY QUAY_REPO CATALOG_INDEX_IMAGE CHART_VERSION

echo "========== Gangway API Overrides =========="
if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_GITHUB_ORG_NAME}" ]]; then
Expand Down Expand Up @@ -121,17 +119,9 @@ if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_IMAGE_REGISTRY}" ]]; then
IMAGE_REGISTRY="${MULTISTAGE_PARAM_OVERRIDE_IMAGE_REGISTRY}"
echo "Override applied: IMAGE_REGISTRY=${IMAGE_REGISTRY}"
fi
if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REGISTRY}" ]]; then
CATALOG_INDEX_REGISTRY="${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REGISTRY}"
echo "Override applied: CATALOG_INDEX_REGISTRY=${CATALOG_INDEX_REGISTRY}"
fi
if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REPO}" ]]; then
CATALOG_INDEX_REPO="${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REPO}"
echo "Override applied: CATALOG_INDEX_REPO=${CATALOG_INDEX_REPO}"
fi
if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_TAG}" ]]; then
CATALOG_INDEX_TAG="${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_TAG}"
echo "Override applied: CATALOG_INDEX_TAG=${CATALOG_INDEX_TAG}"
if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE}" ]]; then
CATALOG_INDEX_IMAGE="${MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE}"
echo "Override applied: CATALOG_INDEX_IMAGE=${CATALOG_INDEX_IMAGE}"
fi
if [[ -n "${MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION}" ]]; then
CHART_VERSION="${MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION}"
Expand Down
10 changes: 2 additions & 8 deletions ...cp/helm/disconnected/nightly/redhat-developer-rhdh-ocp-helm-disconnected-nightly-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,9 @@ ref:
- name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME
default: ""
documentation: Optional. Overrides TAG_NAME via Gangway API.
- name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REGISTRY
- name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE
default: ""
documentation: Optional. Overrides CATALOG_INDEX_REGISTRY via Gangway API (default quay.io).
- name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REPO
default: ""
documentation: Optional. Overrides CATALOG_INDEX_REPO via Gangway API (default rhdh/plugin-catalog-index).
- name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_TAG
default: ""
documentation: Optional. Overrides CATALOG_INDEX_TAG via Gangway API (default derived from branch).
documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.10).
- name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION
default: ""
documentation: Optional. Overrides CHART_VERSION via Gangway API.
Expand Down
10 changes: 2 additions & 8 deletions ...tor/disconnected/nightly/redhat-developer-rhdh-ocp-operator-disconnected-nightly-ref.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,9 @@ ref:
- name: MULTISTAGE_PARAM_OVERRIDE_TAG_NAME
default: ""
documentation: Optional. Overrides TAG_NAME via Gangway API.
- name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REGISTRY
- name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_IMAGE
default: ""
documentation: Optional. Overrides CATALOG_INDEX_REGISTRY via Gangway API (default quay.io).
- name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_REPO
default: ""
documentation: Optional. Overrides CATALOG_INDEX_REPO via Gangway API (default rhdh/plugin-catalog-index).
- name: MULTISTAGE_PARAM_OVERRIDE_CATALOG_INDEX_TAG
default: ""
documentation: Optional. Overrides CATALOG_INDEX_TAG via Gangway API (default derived from branch).
documentation: Optional. Overrides CATALOG_INDEX_IMAGE via Gangway API (e.g. quay.io/rhdh/plugin-catalog-index:1.10).
- name: MULTISTAGE_PARAM_OVERRIDE_CHART_VERSION
default: ""
documentation: Optional. Overrides CHART_VERSION via Gangway API.
Expand Down