From 1a50b9c67b2f71c1aa5f1e8948d57a94cd240689 Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Thu, 29 Aug 2024 14:40:40 -0500
Subject: [PATCH] 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.
---
 common.sh  | 2 +-
 network.sh | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/common.sh b/common.sh
index f3aac74eb..daab230b1 100644
--- a/common.sh
+++ b/common.sh
@@ -481,7 +481,7 @@ if [[ ! -z ${AGENT_E2E_TEST_BOOT_MODE} ]]; then
   esac
 fi
 
-if [[ (-n "$MIRROR_IMAGES" && "${MIRROR_IMAGES,,}" != "false") || -z "${IP_STACK:-}" || "$IP_STACK" = "v6" ]]; then
+if [[ (-n "$MIRROR_IMAGES" && "${MIRROR_IMAGES,,}" != "false") || -z "${IP_STACK:-}" || "$IP_STACK" = "v6" || "$IP_STACK" = "v6v4" ]]; then
 
    if [[ "${MIRROR_COMMAND}" == "oc-mirror" ]]; then
       # Use the string that is generated by the output of oc-mirror
diff --git a/network.sh b/network.sh
index 1e26f91ee..522a21dd2 100755
--- a/network.sh
+++ b/network.sh
@@ -148,6 +148,11 @@ elif [[ "$IP_STACK" = "v4v6" || "$IP_STACK" = "v6v4" ]]; then
   export SERVICE_SUBNET_V4=${SERVICE_SUBNET_V4:-"172.30.0.0/16"}
   export SERVICE_SUBNET_V6=${SERVICE_SUBNET_V6:-"fd02::/112"}
   export NETWORK_TYPE=${NETWORK_TYPE:-"OVNKubernetes"}
+  # Although v6-primary clusters have access to both v4 and v6, during provisioning
+  # the nodes only get v6 addresses so we need to mirror images or they can't pull.
+  if [[ "$IP_STACK" = "v6v4" ]]; then
+    export MIRROR_IMAGES=true
+  fi
 else
   echo "Unexpected setting for IP_STACK: '${IP_STACK}'"
   exit 1