Skip to content

Commit 1a50b9c

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 872f6b8 commit 1a50b9c

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -481,7 +481,7 @@ if [[ ! -z ${AGENT_E2E_TEST_BOOT_MODE} ]]; then
481481
esac
482482
fi
483483

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

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

network.sh

+5
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=true
155+
fi
151156
else
152157
echo "Unexpected setting for IP_STACK: '${IP_STACK}'"
153158
exit 1

0 commit comments

Comments
 (0)