Skip to content

Commit d7ce3f4

Browse files
authored
Always mirror with --keep-manifest-list=true (#1648)
The code to conditionaly add --keep-manifest-list=true to the mirror command was added for a now unsupported version of OC. Remove it as it doesn't always work e.g. if the .releaseClientVersion doesn't follow the 4.XX... format. 4.15.0-0.nightly-2024-..-..... vs 0.0.1-0.test-2024-....-latest
1 parent 24aed67 commit d7ce3f4

File tree

1 file changed

+1
-8
lines changed

1 file changed

+1
-8
lines changed

utils.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -448,15 +448,8 @@ function setup_legacy_release_mirror {
448448
mkdir $REGISTRY_DIR
449449
fi
450450
451-
# Explicitly request that manifest lists arn't unpacked (causing digests of the images to change)
452-
# Not supported by oc <= 4.10
453-
OCEXTRAPARAMS=
454-
if echo -e "4.11\n$(oc version -o json | jq .releaseClientVersion -r)" | sort -V -C ; then
455-
OCEXTRAPARAMS="--keep-manifest-list=true"
456-
fi
457-
458451
oc adm release mirror \
459-
--insecure=true $OCEXTRAPARAMS \
452+
--insecure=true --keep-manifest-list=true \
460453
-a ${PULL_SECRET_FILE} \
461454
--from ${OPENSHIFT_RELEASE_IMAGE} \
462455
--to-release-image ${LOCAL_REGISTRY_DNS_NAME}:${LOCAL_REGISTRY_PORT}/localimages/local-release-image:${OPENSHIFT_RELEASE_TAG} \

0 commit comments

Comments
 (0)