Skip to content

Commit cd32168

Browse files
committed
Fix mirror config for v6-primary
It turns out we do need to mirror images for v6-primary clusters because during provisioning they only get an IP from the primary family, which means they can't pull images from the public ipv4 image registries. This fixes the logic so it is all consistent where it needs to be so v6-primary deployments will work as intended by default.
1 parent ff0f5d3 commit cd32168

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

common.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,8 +547,7 @@ if [[ "${SCENARIO}" == "SNO" ]]; then
547547
fi
548548
fi
549549

550-
if [[ "${MIRROR_IMAGES,,}" != "false" ]] && [[ "${MIRROR_IMAGES,,}" == "true" || -z "${IP_STACK:-}" || "$IP_STACK" = "v6" ]]; then
551-
550+
if [[ "${MIRROR_IMAGES,,}" != "false" ]] && [[ "${MIRROR_IMAGES,,}" == "true" || -z "${IP_STACK:-}" || "$IP_STACK" = "v6" || "$IP_STACK" = "v6v4" ]]; then
552551
if [[ "${MIRROR_COMMAND}" == "oc-mirror" ]]; then
553552
# Use the string that is generated by the output of oc-mirror
554553
export LOCAL_IMAGE_URL_SUFFIX="openshift/release-images"

network.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,11 @@ elif [[ "$IP_STACK" = "v4v6" || "$IP_STACK" = "v6v4" ]]; then
148148
export SERVICE_SUBNET_V4=${SERVICE_SUBNET_V4:-"172.30.0.0/16"}
149149
export SERVICE_SUBNET_V6=${SERVICE_SUBNET_V6:-"fd02::/112"}
150150
export NETWORK_TYPE=${NETWORK_TYPE:-"OVNKubernetes"}
151+
# Although v6-primary clusters have access to both v4 and v6, during provisioning
152+
# the nodes only get v6 addresses so we need to mirror images or they can't pull.
153+
if [[ "$IP_STACK" = "v6v4" ]]; then
154+
export MIRROR_IMAGES=${MIRROR_IMAGES:-true}
155+
fi
151156
else
152157
echo "Unexpected setting for IP_STACK: '${IP_STACK}'"
153158
exit 1

0 commit comments

Comments
 (0)