fix network e2e tests

liqotech · Jul 17, 2021 · eca6f11 · eca6f11
1 parent eff4c61
commit eca6f11
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/test/e2e/peering_e2e/basic_test.go b/test/e2e/peering_e2e/basic_test.go
@@ -75,8 +75,9 @@ var _ = Describe("Liqo E2E", func() {
 					})
 
 					By("Check Service NodePort Connectivity", func() {
-						err := net.ConnectivityCheckNodeToPod(ctx, homeCluster.Client, homeCluster.ClusterID)
-						Expect(err).ToNot(HaveOccurred())
+						Eventually(func() error {
+							return net.ConnectivityCheckNodeToPod(ctx, homeCluster.Client, homeCluster.ClusterID)
+						}, timeout, interval).ShouldNot(HaveOccurred())
 					})
 				},
 				Entry("Check Pod to Pod connectivity from cluster 1", testContext.Clusters[0], testContext.Clusters[1], namespace),

diff --git a/test/e2e/testutils/net/net.go b/test/e2e/testutils/net/net.go
@@ -64,6 +64,7 @@ func CheckPodConnectivity(ctx context.Context, homeConfig *restclient.Config, ho
 		return err
 	}
 	cmd := command + podRemoteUpdateCluster1.Status.PodIP
+	klog.Infof("running command %s", cmd)
 	stdout, stderr, err := util.ExecCmd(homeConfig, homeClient, podLocalUpdate.Name, podLocalUpdate.Namespace, cmd)
 	if stdout == "200" && err == nil {
 		return nil

diff --git a/test/e2e/testutils/net/svc.go b/test/e2e/testutils/net/svc.go
@@ -40,14 +40,6 @@ func EnsureNodePort(ctx context.Context, client kubernetes.Interface, clusterID,
 			klog.Error(err)
 			return nil, err
 		}
-		clusterIP := nodePort.Spec.ClusterIP
-		nodePort.Spec = serviceSpec
-		nodePort.Spec.ClusterIP = clusterIP
-		_, err = client.CoreV1().Services(namespace).Update(ctx, nodePort, metav1.UpdateOptions{})
-		if err != nil {
-			klog.Errorf("%s -> an error occurred while updating nodePort service %s : %s", clusterID, name, err)
-			return nil, err
-		}
 	}
 	if err != nil {
 		klog.Errorf("%s -> an error occurred while creating nodePort service %s in namespace %s: %s", clusterID, name, namespace, err)

diff --git a/test/e2e/testutils/util/exec.go b/test/e2e/testutils/util/exec.go
@@ -61,9 +61,10 @@ func TriggerCheckNodeConnectivity(localNodes *v1.NodeList, command string, nodeP
 		klog.Infof("running command %s", cmd)
 		err := c.Run()
 		if err != nil {
+			klog.Error(err)
 			klog.Info(output.String())
 			klog.Info(errput.String())
-			return nil
+			return err
 		}
 	}
 	return nil