Skip to content

OCPBUGS-120843: Preserve non-OLM component image defaults when bundle CSV values are missing #1277

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
Pratik-Redhat-Tech wants to merge 2 commits into
base: master
Choose a base branch
from
+27 −11
Open

OCPBUGS-120843: Preserve non-OLM component image defaults when bundle CSV values are missing #1277

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f35f876
Preserve non-OLM component image defaults when bundle CSV values are …
Pratik-Redhat-Tech Sep 7, 2026
0c7d0c8
Avoid eval when applying bundle image overrides
Pratik-Redhat-Tech Sep 7, 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
38 changes: 27 additions & 11 deletions hack/non-olm-install/install-gitops-operator.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,23 +268,39 @@ spec:
type: RuntimeDefault" > ${WORK_DIR}/security-context.yaml
}

function apply_bundle_env_image_override() {
local var_name="$1"
local env_name="$2"
local bundle_value

bundle_value=$(cat "${WORK_DIR}"/container.yaml | ${YQ} ".env[] | select(.name==\"${env_name}\").value")
if [ -n "${bundle_value}" ] && [ "${bundle_value}" != "null" ]; then
printf -v "$var_name" '%s' "$bundle_value"
fi
}

function extract_component_images_from_bundle_image() {
${REGCTL} image get-file "${BUNDLE_IMG}" manifests/gitops-operator.clusterserviceversion.yaml "${WORK_DIR}"/gitops-operator.clusterserviceversion.yaml

CONTAINER_YAML=$(cat "${WORK_DIR}"/gitops-operator.clusterserviceversion.yaml | ${YQ} '.spec.install.spec | .deployments[0].spec.template.spec.containers[0]' > "${WORK_DIR}"/container.yaml)

# Get the operator image from the CSV of the operator bundle
OPERATOR_IMG=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.image')

# Get the component images from the CSV of the operator bundle
ARGOCD_DEX_IMAGE=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="ARGOCD_DEX_IMAGE").value')
ARGOCD_IMAGE=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="ARGOCD_IMAGE").value')
ARGOCD_KEYCLOAK_IMAGE=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="ARGOCD_KEYCLOAK_IMAGE").value')
ARGOCD_REDIS_IMAGE=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="ARGOCD_REDIS_IMAGE").value')
ARGOCD_REDIS_HA_PROXY_IMAGE=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="ARGOCD_REDIS_HA_PROXY_IMAGE").value')
BACKEND_IMAGE=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="BACKEND_IMAGE").value')
GITOPS_CONSOLE_PLUGIN_IMAGE=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="GITOPS_CONSOLE_PLUGIN_IMAGE").value')
GITOPS_CONSOLE_PLUGIN_IMAGE_PF5=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.env[] | select(.name=="GITOPS_CONSOLE_PLUGIN_IMAGE_PF5").value')
local bundle_operator_img
bundle_operator_img=$(cat "${WORK_DIR}"/container.yaml | ${YQ} '.image')
if [ -n "${bundle_operator_img}" ] && [ "${bundle_operator_img}" != "null" ]; then
OPERATOR_IMG="${bundle_operator_img}"
fi

# Get the component images from the CSV of the operator bundle.
# Preserve script defaults when the bundle CSV omits a variable or value is empty.
apply_bundle_env_image_override ARGOCD_DEX_IMAGE ARGOCD_DEX_IMAGE
apply_bundle_env_image_override ARGOCD_IMAGE ARGOCD_IMAGE
apply_bundle_env_image_override ARGOCD_KEYCLOAK_IMAGE ARGOCD_KEYCLOAK_IMAGE
apply_bundle_env_image_override ARGOCD_REDIS_IMAGE ARGOCD_REDIS_IMAGE
apply_bundle_env_image_override ARGOCD_REDIS_HA_PROXY_IMAGE ARGOCD_REDIS_HA_PROXY_IMAGE
apply_bundle_env_image_override BACKEND_IMAGE BACKEND_IMAGE
apply_bundle_env_image_override GITOPS_CONSOLE_PLUGIN_IMAGE GITOPS_CONSOLE_PLUGIN_IMAGE
apply_bundle_env_image_override GITOPS_CONSOLE_PLUGIN_IMAGE_PF5 GITOPS_CONSOLE_PLUGIN_IMAGE_PF5
}

# Initialize a temporary work directory to store the artifacts and
Expand Down