Fix ENABLE_IPV6 flag value for dualstack test case

Signed-off-by: Marek Chodor <[email protected]> Change-Id: Idae0ea87fc7d0b74e288cea1ef2857152e3c54a0
GoogleCloudPlatform · Feb 8, 2024 · 8e56a82 · 8e56a82
1 parent 5ef8eef
commit 8e56a82
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/scripts/install-cni.sh b/scripts/install-cni.sh
@@ -175,12 +175,15 @@ 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
       SUBNETS_REPLACEMENT+=("[{\"subnet\": \"${subnet}\"}]")
       ROUTES_REPLACEMENT+=("{\"dst\": \"0.0.0.0/0\"}")
     elif is_ipv6_range "$subnet" ; then
       POPULATE_IP6TABLES="true"
+      ipv6_subnet_configured="true"
       SUBNETS_REPLACEMENT+=("[{\"subnet\": \"${subnet}\"}]")
       ROUTES_REPLACEMENT+=("{\"dst\": \"::/0\"}")
     else
@@ -190,7 +193,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
@@ -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
@@ -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