Skip to content

[release-1.6] fix: Fix the airgap script on ROSA/HyperShift 4.18 by skipping the creation of an IDMS resource #968

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

Merged
rm3l merged 3 commits into from
Apr 1, 2025
Merged

[release-1.6] fix: Fix the airgap script on ROSA/HyperShift 4.18 by skipping the creation of an IDMS resource #968

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3fbcdaa
fix: Detect if the OCP cluster has a hosted control plane or not
rm3l Mar 31, 2025
00a5c35
fix: Skip the creation of the IDMS resource on clusters with hosted c…
rm3l Mar 31, 2025
3beef09
fix: Skip disabling default sources of the cluster-wide OperatorHub r…
rm3l Mar 31, 2025
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
30 changes: 25 additions & 5 deletions .rhdh/scripts/prepare-restricted-environment.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ SCRIPT_PATH=$(realpath "$0")
NC='\033[0m'

IS_OPENSHIFT=""
IS_HOSTED_CONTROL_PLANE=""

NAMESPACE_SUBSCRIPTION="rhdh-operator"
NAMESPACE_OPERATOR="rhdh-operator"
Expand Down Expand Up @@ -217,8 +218,22 @@ function is_openshift() {
function detect_ocp_and_set_env_var() {
set -euo pipefail

if [[ "${IS_OPENSHIFT}" = "" ]]; then
if [[ -z "${IS_OPENSHIFT}" ]]; then
IS_OPENSHIFT=$(is_openshift && echo 'true' || echo 'false')
debugf "IS_OPENSHIFT: ${IS_OPENSHIFT}"
fi
if [[ "${IS_OPENSHIFT}" == "true" ]] && [[ -z "${IS_HOSTED_CONTROL_PLANE}" ]]; then
local cpTech
cpTech=$(oc get infrastructure cluster -o jsonpath='{.status.controlPlaneTopology}' || \
(warnf 'Could not determine the cluster type => defaulting to the hosted control plane behavior' >&2 && echo 'External'))
if [[ "${cpTech}" == "External" ]]; then
# 'External' indicates that the control plane is hosted externally to the cluster
# and that its components are not visible within the cluster.
IS_HOSTED_CONTROL_PLANE="true"
else
IS_HOSTED_CONTROL_PLANE="false"
fi
debugf "IS_HOSTED_CONTROL_PLANE: ${IS_HOSTED_CONTROL_PLANE}"
fi
}

Expand Down Expand Up @@ -1124,16 +1139,21 @@ EOF
EOF
done

# Create the IDMS (OCP-specific) and CatalogSource
if [[ "${IS_OPENSHIFT}" = "true" ]]; then
invoke_cluster_cli apply -f "${manifestsTargetDir}/imageDigestMirrorSet.yaml"
# Create the IDMS (OCP-specific) and CatalogSource.
# IDMS resources never really worked on clusters with hosted control planes, and it looks like it is no longer
# possible to create them in ROSA/HyperShift 4.18. So skipping the IDMS creation for such clusters.
# More details in https://issues.redhat.com/browse/RHIDP-6684
if [[ "${IS_OPENSHIFT}" == "true" ]] && [[ "${IS_HOSTED_CONTROL_PLANE}" != "true" ]]; then
invoke_cluster_cli apply -f "${manifestsTargetDir}/imageDigestMirrorSet.yaml"
fi
debugf "Adding the internal cluster creds as pull secrets to be able to pull images from this internal registry by default"
invoke_cluster_cli apply -f "${manifestsTargetDir}/catalogSource.yaml"
fi
fi

if [[ -n "${TO_REGISTRY}" && "${IS_OPENSHIFT}" = "true" ]]; then
# No longer possible to patch the OperatorHub resource on clusters with hosted control planes (ROSA 4.18).
# More details in https://issues.redhat.com/browse/OCPBUGS-43431?focusedId=26463911&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-26463911
if [[ -n "${TO_REGISTRY}" ]] && [[ "${IS_OPENSHIFT}" == "true" ]] && [[ "${IS_HOSTED_CONTROL_PLANE}" != "true" ]]; then
infof "Disabling the default Red Hat Ecosystem Catalog."
invoke_cluster_cli patch OperatorHub cluster --type json \
--patch '[{"op": "add", "path": "/spec/disableAllDefaultSources", "value": true}]'
Expand Down