Add and improve the e2e use case of the NIC where the default route i…

…s located Signed-off-by: ty-dc <[email protected]>
spidernet-io · Oct 18, 2023 · 5652af4 · 5652af4
1 parent 39eb7b4
commit 5652af4
Show file tree

Hide file tree

Showing 5 changed files with 323 additions and 23 deletions.
diff --git a/test/Makefile b/test/Makefile
@@ -179,6 +179,13 @@ setup_spiderpool:
 		fi ; \
 		if [ "$(E2E_SPIDERPOOL_ENABLE_COORDINATOR)" == "true" ] ; then \
 		    HELM_OPTION+=" --set coordinator.enabled=true " ; \
+			if [ "$(INSTALL_CILIUM)" == "true" && "$(E2E_IP_FAMILY)" == "ipv4" && "$(E2E_IP_FAMILY)" == "ipv6" ] ; then \
+				HELM_OPTION+=" --set coordinator.hijackCIDR={$(CILIUM_CLUSTER_POD_SUBNET_V4),$(CILIUM_CLUSTER_POD_SUBNET_V6)} " ; \
+			elif [ "$(INSTALL_CILIUM)" == "true" && "$(E2E_IP_FAMILY)" == "ipv4" ] ; then \
+			    HELM_OPTION+=" --set coordinator.hijackCIDR={$(CILIUM_CLUSTER_POD_SUBNET_V4)} " ; \
+			elif [ "$(INSTALL_CILIUM)" == "true" && "$(E2E_IP_FAMILY)" == "ipv6" ] ; then \
+			    HELM_OPTION+=" --set coordinator.hijackCIDR={$(CILIUM_CLUSTER_POD_SUBNET_V6)} " ; \
+			fi ; \
 		else \
 		  	HELM_OPTION+=" --set coordinator.enabled=false " ; \
 		fi ; \

diff --git a/test/Makefile.defs b/test/Makefile.defs
@@ -10,9 +10,9 @@ K8S_IPV4_SERVICE_CIDR = 10.233.0.0/18
 K8S_IPV6_SERVICE_CIDR = fd00:10:233::/116
 
 CLUSTER_POD_SUBNET_V4 = 10.233.64.0/18
-CLUSTER_POD_SUBNET_V6 = fd00:10:233:64::/64
-CILIUM_CLUSTER_POD_SUBNET_V4 = 10.244.64.0/18
-CILIUM_CLUSTER_POD_SUBNET_V6 = fd00:10:244::/112
+CLUSTER_POD_SUBNET_V6 = fd00:10:233::/64
+CILIUM_CLUSTER_POD_SUBNET_V4 = 10.233.64.0/18
+CILIUM_CLUSTER_POD_SUBNET_V6 = fd00:10:233::/112
 
 # ipv4 or ipv6 or dual, default ipv4
 E2E_IP_FAMILY ?= dual

diff --git a/test/doc/coordinator.md b/test/doc/coordinator.md
@@ -6,9 +6,10 @@
 | C00002  | coordinator in tuneMode: overlay works well | p1      |  smoke  | done   |       |
 | C00003  | coordinator in tuneMode: underlay with two NIC | p1      |  smoke  |    |       |
 | C00004  | coordinator in tuneMode: overlay with two  NIC | p1      |  smoke  |    |       |
-| C00005  | In overlay mode: specify the NIC where the default route is located | p2     |    |  done  |       |
-| C00006  | In underlay mode: specify the NIC where the default route is located | p2     |    |       |       |
+| C00005  | In overlay mode: specify the NIC (eth0) where the default route is located, use 'ip r get 8.8.8.8' to see if default route nic is the specify NIC | p2     |    |  done  |       |
+| C00006  | In underlay mode: specify the NIC (eth0) where the default route is located, use 'ip r get 8.8.8.8' to see if default route nic is the specify NIC | p2     |    |       |       |
 | C00007  | ip conflict detection (ipv4, ipv6) | p2     |    |  done  |       |
 | C00008  | override pod mac prefix | p2       |       | done  |       |
 | C00009  | gateway connection detection                  | p2     |    |  done  |       |
 | C00010  | auto clean up the dirty rules(routing\neighborhood) while pod starting | p2 | | |
+| C00011  | In the default scenario (Do not specify the NIC where the default route is located in any way) , use 'ip r get 8.8.8.8' to see if default route NIC is `net1` | p2 | | |
diff --git a/test/e2e/common/constant.go b/test/e2e/common/constant.go
@@ -42,6 +42,12 @@ const (
 	SpiderPoolConfigmapNameSpace = "kube-system"
 )
 
+// Kubeadm configurations
+const (
+	KubeadmConfigmapName      = "kubeadm-config"
+	KubeadmConfigmapNameSpace = "kube-system"
+)
+
 // Network configurations
 var (
 	// multus CNI