From 3d7a3a11ca27fa2d7668a0a9a65e8ccd4896d97f Mon Sep 17 00:00:00 2001
From: Dan Winship <danwinship@redhat.com>
Date: Wed, 19 May 2021 11:40:03 -0400
Subject: [PATCH] Only do the feature-gate override for dual-stack on 4.6 and
 4.7

---
 utils.sh | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
 mode change 100644 => 100755 utils.sh

diff --git a/utils.sh b/utils.sh
old mode 100644
new mode 100755
index b128f016c..eb450cfb8
--- a/utils.sh
+++ b/utils.sh
@@ -67,11 +67,9 @@ function create_cluster() {
 
     find assets/generated -name '*.yaml' -exec cp -f {} ${assets_dir}/openshift \;
 
-    if [[ "${IP_STACK}" == "v4v6" ]]; then
-        # The IPv6DualStack feature is not on by default, because it doesn't
-        # fully work yet.  If we're running a dual-stack test environment,
-        # we will turn on the IPv6DualStackNoUpgrade feature set for testing
-        # purposes.
+    if [[ "${IP_STACK}" == "v4v6" && "$OPENSHIFT_VERSION" =~ 4.[67] ]]; then
+        # The IPv6DualStack feature is not on by default in 4.6 and 4.7 and needs
+        # to be manually enabled
         cp assets/ipv6-dual-stack-no-upgrade.yaml ${assets_dir}/openshift/.
     fi