From bfd8281006b1c255ff8fa4af2aa703e8b53c3900 Mon Sep 17 00:00:00 2001
From: Marek Chodor <mchodor@google.com>
Date: Thu, 8 Feb 2024 10:37:14 +0000
Subject: [PATCH] Fix ENABLE_IPV6 flag value for dualstack test case

Signed-off-by: Marek Chodor <mchodor@google.com>
Change-Id: Idae0ea87fc7d0b74e288cea1ef2857152e3c54a0
---
 scripts/install-cni.sh                    | 5 ++++-
 scripts/testcase/testcase-dualstack-v2.sh | 2 +-
 scripts/testcase/testcase-dualstack.sh    | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/scripts/install-cni.sh b/scripts/install-cni.sh
index 4d801253d..2633f3497 100755
--- a/scripts/install-cni.sh
+++ b/scripts/install-cni.sh
@@ -175,6 +175,8 @@ function fillSubnetsInCniSpec {
   local SUBNETS_REPLACEMENT=""
   local ROUTES_REPLACEMENT=""
 
+  local ipv6_subnet_configured="false"
+
   for subnet in $(jq -r '.spec.podCIDRs[]' <<<"$node") ; do
     if is_ipv4_range "$subnet" ; then
       if [ "" != "${SUBNETS_REPLACEMENT}" ] ; then
@@ -185,6 +187,7 @@ function fillSubnetsInCniSpec {
       ROUTES_REPLACEMENT="${ROUTES_REPLACEMENT}{\"dst\": \"0.0.0.0/0\"}"
     elif is_ipv6_range "$subnet" ; then
       POPULATE_IP6TABLES="true"
+      ipv6_subnet_configured="true"
       if [ "" != "${SUBNETS_REPLACEMENT}" ] ; then
         SUBNETS_REPLACEMENT="${SUBNETS_REPLACEMENT}, "
         ROUTES_REPLACEMENT="${ROUTES_REPLACEMENT}, "
@@ -198,7 +201,7 @@ function fillSubnetsInCniSpec {
   done
 
   # Directpath use case
-  if [ "$ENABLE_IPV6" == "true" ] ; then
+  if [ "$ENABLE_IPV6" == "true" ] && [ "$ipv6_subnet_configured" == "false" ] ; then
     # Directpath adds IPv6 subnet and route derived from host with fixed range
     # of /112 even when it is not specified in node's .spec.podCIDRs
     if [ -n "${node_ipv6_addr:-}" ] && [ "${node_ipv6_addr}" != "null" ]; then
diff --git a/scripts/testcase/testcase-dualstack-v2.sh b/scripts/testcase/testcase-dualstack-v2.sh
index 27abb555b..5fa6a4598 100644
--- a/scripts/testcase/testcase-dualstack-v2.sh
+++ b/scripts/testcase/testcase-dualstack-v2.sh
@@ -5,7 +5,7 @@ export ENABLE_CALICO_NETWORK_POLICY=false
 export ENABLE_BANDWIDTH_PLUGIN=false
 export ENABLE_CILIUM_PLUGIN=false
 export ENABLE_MASQUERADE=false
-export ENABLE_IPV6=false
+export ENABLE_IPV6=true
 
 CNI_SPEC_TEMPLATE=$(cat testdata/spec-template-v2.json)
 export CNI_SPEC_TEMPLATE
diff --git a/scripts/testcase/testcase-dualstack.sh b/scripts/testcase/testcase-dualstack.sh
index dbe1a3915..8a5d36a91 100644
--- a/scripts/testcase/testcase-dualstack.sh
+++ b/scripts/testcase/testcase-dualstack.sh
@@ -5,7 +5,7 @@ export ENABLE_CALICO_NETWORK_POLICY=false
 export ENABLE_BANDWIDTH_PLUGIN=false
 export ENABLE_CILIUM_PLUGIN=false
 export ENABLE_MASQUERADE=false
-export ENABLE_IPV6=false
+export ENABLE_IPV6=true
 
 CNI_SPEC_TEMPLATE=$(cat testdata/spec-template.json)
 export CNI_SPEC_TEMPLATE