Merge pull request #2015 from ty-dc/pr/fix_cilium

set testIPv6 to false for cilium mode
spidernet-io · Jul 11, 2023 · 0b1744e · 0b1744e
2 parents 9b0f490 + b2d37ba
commit 0b1744e
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/test/e2e/common/mode.go b/test/e2e/common/mode.go
@@ -11,6 +11,7 @@ import (
 const (
 	ENV_INSTALL_OVERLAY          = "INSTALL_OVERLAY_CNI"
 	E2E_SPIDERPOOL_ENABLE_SUBNET = "E2E_SPIDERPOOL_ENABLE_SUBNET"
+	INSTALL_CILIUM               = "INSTALL_CILIUM"
 )
 
 func checkBoolEnv(name string) bool {
@@ -29,3 +30,7 @@ func CheckRunOverlayCNI() bool {
 func CheckSubnetFeatureOn() bool {
 	return checkBoolEnv(E2E_SPIDERPOOL_ENABLE_SUBNET)
 }
+
+func CheckCiliumFeatureOn() bool {
+	return checkBoolEnv(INSTALL_CILIUM)
+}
diff --git a/test/e2e/coordinator/macvlan-overlay-one/macvlan_overlay_one_test.go b/test/e2e/coordinator/macvlan-overlay-one/macvlan_overlay_one_test.go
@@ -93,8 +93,15 @@ var _ = Describe("MacvlanOverlayOne", Serial, Label("overlay", "one-nic", "coord
 		targetAgent.TestClusterIp = true
 		targetAgent.TestMultusInterface = frame.Info.MultusEnabled
 		targetAgent.TestNodePort = true
+
 		targetAgent.TestIPv4 = &frame.Info.IpV4Enabled
-		targetAgent.TestIPv6 = &frame.Info.IpV6Enabled
+		if common.CheckCiliumFeatureOn() {
+			// TODO(tao.yang), set testIPv6 to false, reference issue: https://github.com/spidernet-io/spiderpool/issues/2007
+			testIPv6 := false
+			targetAgent.TestIPv6 = &testIPv6
+		} else {
+			targetAgent.TestIPv6 = &frame.Info.IpV6Enabled
+		}
 
 		target.TargetAgent = targetAgent
 		task.Spec.Target = target
@@ -130,9 +137,10 @@ var _ = Describe("MacvlanOverlayOne", Serial, Label("overlay", "one-nic", "coord
 				Expect(errors.New("wait nethttp test timeout")).NotTo(HaveOccurred(), " running spiderdoctor task timeout")
 			default:
 				err = frame.GetResource(apitypes.NamespacedName{Name: name}, taskCopy)
-				Expect(err).NotTo(HaveOccurred(), " spiderdoctor nethttp crd get failed")
+				Expect(err).NotTo(HaveOccurred(), "spiderdoctor nethttp crd get failed,err is %v", err)
 
 				if taskCopy.Status.Finish == true {
+					GinkgoWriter.Printf("spiderdoctor's nethttp execution result %+v", taskCopy)
 					for _, v := range taskCopy.Status.History {
 						if v.Status == "succeed" {
 							err1 = nil