Skip to content

Commit 940ab78

Browse files
authored
NO-ISSUE: revert unwanted images mirroring (#1694)
* revert unwanted images mirroring * restore original checks to allow setting OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE when required
1 parent 5756e9c commit 940ab78

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

common.sh

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -73,10 +73,6 @@ export SSH_PUB_KEY="${SSH_PUB_KEY:-$(cat $HOME/.ssh/id_rsa.pub)}"
7373

7474
# mirror images for installation in restricted network
7575
export MIRROR_IMAGES=${MIRROR_IMAGES:-}
76-
# For IPv6 (default case) mirror images are used since quay doesn't support IPv6
77-
if [[ -z "${IP_STACK:-}" || "$IP_STACK" = "v6" || "$IP_STACK" = "v6v4" ]]; then
78-
export MIRROR_IMAGES=${MIRROR_IMAGES:-true}
79-
fi
8076

8177
# identify the command used to mirror images, either 'oc-adm' or 'oc-mirror'
8278
export MIRROR_COMMAND=${MIRROR_COMMAND:-oc-adm}
@@ -485,7 +481,7 @@ if [[ ! -z ${AGENT_E2E_TEST_BOOT_MODE} ]]; then
485481
esac
486482
fi
487483

488-
if [[ -n "$MIRROR_IMAGES" && "${MIRROR_IMAGES,,}" != "false" ]]; then
484+
if [[ (-n "$MIRROR_IMAGES" && "${MIRROR_IMAGES,,}" != "false") || -z "${IP_STACK:-}" || "$IP_STACK" = "v6" ]]; then
489485

490486
if [[ "${MIRROR_COMMAND}" == "oc-mirror" ]]; then
491487
# Use the string that is generated by the output of oc-mirror

0 commit comments

Comments
 (0)