For dualstack and ipv6 the default ipv6 range should be same with the…

… ipv4 cidr. (#2708)
kubeovn · Apr 25, 2023 · 7dbfd2b · 7dbfd2b
1 parent 15780bf
commit 7dbfd2b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/charts/values.yaml b/charts/values.yaml
@@ -71,18 +71,18 @@ ipv4:
   PINGER_EXTERNAL_DOMAIN: "alauda.cn"
 
 ipv6:
-  POD_CIDR: "fd00:10:16::/64"
+  POD_CIDR: "fd00:10:16::/112"
   POD_GATEWAY: "fd00:10:16::1"
   SVC_CIDR: "fd00:10:96::/112"
-  JOIN_CIDR: "fd00:100:64::/64"
+  JOIN_CIDR: "fd00:100:64::/112"
   PINGER_EXTERNAL_ADDRESS: "2400:3200::1"
   PINGER_EXTERNAL_DOMAIN: "google.com"
 
 dual_stack:
-  POD_CIDR: "10.16.0.0/16,fd00:10:16::/64"
+  POD_CIDR: "10.16.0.0/16,fd00:10:16::/112"
   POD_GATEWAY: "10.16.0.1,fd00:10:16::1"
   SVC_CIDR: "10.96.0.0/12,fd00:10:96::/112"
-  JOIN_CIDR: "100.64.0.0/16,fd00:100:64::/64"
+  JOIN_CIDR: "100.64.0.0/16,fd00:100:64::/112"
   PINGER_EXTERNAL_ADDRESS: "114.114.114.114,2400:3200::1"
   PINGER_EXTERNAL_DOMAIN: "google.com"
 

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -48,18 +48,18 @@ PINGER_EXTERNAL_ADDRESS="114.114.114.114"  # Pinger check external ip probe
 PINGER_EXTERNAL_DOMAIN="alauda.cn"         # Pinger check external domain probe
 SVC_YAML_IPFAMILYPOLICY=""
 if [ "$IPV6" = "true" ]; then
-  POD_CIDR="fd00:10:16::/64"                # Do NOT overlap with NODE/SVC/JOIN CIDR
+  POD_CIDR="fd00:10:16::/112"                # Do NOT overlap with NODE/SVC/JOIN CIDR
   POD_GATEWAY="fd00:10:16::1"
   SVC_CIDR="fd00:10:96::/112"               # Do NOT overlap with NODE/POD/JOIN CIDR
-  JOIN_CIDR="fd00:100:64::/64"              # Do NOT overlap with NODE/POD/SVC CIDR
+  JOIN_CIDR="fd00:100:64::/112"              # Do NOT overlap with NODE/POD/SVC CIDR
   PINGER_EXTERNAL_ADDRESS="2400:3200::1"
   PINGER_EXTERNAL_DOMAIN="google.com"
 fi
 if [ "$DUAL_STACK" = "true" ]; then
-  POD_CIDR="10.16.0.0/16,fd00:10:16::/64"                # Do NOT overlap with NODE/SVC/JOIN CIDR
+  POD_CIDR="10.16.0.0/16,fd00:10:16::/112"                # Do NOT overlap with NODE/SVC/JOIN CIDR
   POD_GATEWAY="10.16.0.1,fd00:10:16::1"
   SVC_CIDR="10.96.0.0/12,fd00:10:96::/112"               # Do NOT overlap with NODE/POD/JOIN CIDR
-  JOIN_CIDR="100.64.0.0/16,fd00:100:64::/64"             # Do NOT overlap with NODE/POD/SVC CIDR
+  JOIN_CIDR="100.64.0.0/16,fd00:100:64::/112"             # Do NOT overlap with NODE/POD/SVC CIDR
   PINGER_EXTERNAL_ADDRESS="114.114.114.114,2400:3200::1"
   PINGER_EXTERNAL_DOMAIN="google.com"
   SVC_YAML_IPFAMILYPOLICY="ipFamilyPolicy: PreferDualStack"