E2E: renaming and using existing tools instead of custom code

Signed-off-by: Martin Kennelly <[email protected]>

Author: martinkennelly

test/e2e/e2e.go

@@ -2200,9 +2200,7 @@ var _ = ginkgo.Describe("e2e delete databases", func() {
 		framework.ExpectNoError(<-errChan)
 	}
 
-	twoPodsContinuousConnectivityTest := func(f *framework.Framework,
-		node1Name string, node2Name string,
-		syncChan chan string, errChan chan error) {
+	twoPodsContinuousConnectivityTest := func(f *framework.Framework, node1Name string, node2Name string, syncChan chan string, errChan chan error) {
 		const (
 			pod1Name                  string        = "connectivity-test-pod1"
 			pod2Name                  string        = "connectivity-test-pod2"
@@ -2219,7 +2217,8 @@ var _ = ginkgo.Describe("e2e delete databases", func() {
 
 		ginkgo.By("Checking initial connectivity from one pod to the other and verifying that the connection is achieved")
 
-		stdout, err := e2ekubectl.RunKubectl(f.Namespace.Name, "exec", pod1Name, "--", "curl", fmt.Sprintf("%s/hostname", net.JoinHostPort(pod2IP, "8080")))
+		stdout, err := e2ekubectl.RunKubectl(f.Namespace.Name, "exec", pod1Name, "--", "curl", fmt.Sprintf("%s/hostname",
+			net.JoinHostPort(pod2IP, fmt.Sprintf("%d", podPort))))
 
 		if err != nil || stdout != pod2Name {
 			errChan <- fmt.Errorf("Error: attempted connection to pod %s found err:  %v", pod2Name, err)
@@ -2234,7 +2233,8 @@ var _ = ginkgo.Describe("e2e delete databases", func() {
 				framework.Logf(msg + ": finish connectivity test.")
 				break L
 			default:
-				stdout, err := e2ekubectl.RunKubectl(f.Namespace.Name, "exec", pod1Name, "--", "curl", fmt.Sprintf("%s/hostname", net.JoinHostPort(pod2IP, "8080")))
+				stdout, err := e2ekubectl.RunKubectl(f.Namespace.Name, "exec", pod1Name, "--", "curl", fmt.Sprintf("%s/hostname",
+					net.JoinHostPort(pod2IP, fmt.Sprintf("%d", podPort))))
 				if err != nil || stdout != pod2Name {
 					errChan <- err
 					framework.Failf("Error: attempted connection to pod %s found err:  %v", pod2Name, err)

test/e2e/egressip.go

@@ -411,9 +411,9 @@ var _ = ginkgo.DescribeTableSubtree("e2e egress IP validation", func(netConfigPa
 
 	targetPodAndTest := func(namespace, fromName, toName, toIP string, toPort uint16) wait.ConditionFunc {
 		return func() (bool, error) {
-			dstPortStr := fmt.Sprintf("%d", toPort)
-			stdout, err := e2ekubectl.RunKubectl(namespace, "exec", fromName, "--", "curl", "--connect-timeout", "2",
-				fmt.Sprintf("%s/hostname", net.JoinHostPort(toIP, dstPortStr)))
+			stdout, err := e2ekubectl.RunKubectl(namespace, "exec", fromName, "--",
+				"curl", "--connect-timeout", "2", fmt.Sprintf("%s/hostname",
+					net.JoinHostPort(toIP, fmt.Sprintf("%d", toPort))))
 			if err != nil || stdout != toName {
 				framework.Logf("Error: attempted connection to pod %s found err:  %v", toName, err)
 				return false, nil
@@ -427,7 +427,7 @@ var _ = ginkgo.DescribeTableSubtree("e2e egress IP validation", func(netConfigPa
 			for _, podName := range podNames {
 				_, err := e2ekubectl.RunKubectl(namespace, "exec", podName, "--", "curl", "--connect-timeout", "2", "-k", destination)
 				if err != nil {
-					framework.Logf("Error: attempted connection to API server found err:  %v", err)
+					framework.Logf("Error: attempted connection to destination %s failed, found err:  %v", destination, err)
 					return false, nil
 				}
 			}

test/e2e/network_segmentation_services.go

@@ -42,7 +42,7 @@ var _ = Describe("Network Segmentation: services", func() {
 			serviceTargetPort            = 80
 			userDefinedNetworkIPv4Subnet = "10.128.0.0/16"
 			userDefinedNetworkIPv6Subnet = "2014:100:200::0/60"
-			clientContainer              = "frr"
+			clientContainerName          = "frr"
 		)
 
 		var (

test/e2e/service.go

@@ -2247,11 +2247,13 @@ spec:
 		if err := os.WriteFile("egressip.yaml", []byte(egressIPConfig), 0644); err != nil {
 			framework.Failf("Unable to write CRD config to disk: %v", err)
 		}
-		defer func() {
+		ginkgo.DeferCleanup(func() error {
+			e2ekubectl.RunKubectlOrDie("default", "delete", "-f", "egressip.yaml", "--ignore-not-found=true")
 			if err := os.Remove("egressip.yaml"); err != nil {
-				framework.Logf("Unable to remove the CRD config from disk: %v", err)
+				return fmt.Errorf("unable to remove the CRD config from disk: %v", err)
 			}
-		}()
+			return nil
+		})
 
 		framework.Logf("Create the EgressIP configuration")
 		e2ekubectl.RunKubectlOrDie("default", "create", "-f", "egressip.yaml")
@@ -2289,7 +2291,7 @@ spec:
 		} else if strings.Count(targetPodLogs, lbClientIPv6) >= 2 {
 			framework.Logf("found the expected srcIP %s!", lbClientIPv6)
 		} else {
-			framework.Failf("could not get expected srcIP!")
+			framework.Failf("could not get expected srcIP!, target pod logs:\n%q", targetPodLogs)
 		}
 	})
 })

test/e2e/static_pods.go

@@ -97,8 +97,8 @@ var _ = ginkgo.Describe("Creating a static pod on a node", func() {
 		nodeName := nodes.Items[0].Name
 		podName := fmt.Sprintf("static-pod-%s", nodeName)
 
-		ginkgo.By("copying a pod.yaml file into the /etc/kubernetes/manifests dir of a node")
-		framework.Logf("creating %s on node %s", podName, nodeName)
+		ginkgo.By("creating static pod file")
+
 		var staticPodYaml = fmt.Sprintf(`apiVersion: v1
 kind: Pod
 metadata:
@@ -111,12 +111,12 @@ spec:
       command: ["/bin/bash", "-c", "trap : TERM INT; sleep infinity & wait"]
 `, f.Namespace.Name, images.AgnHost())
 		createStaticPod(f, nodeName, staticPodYaml)
-		err = waitForPodRunningInNamespaceTimeout(f.ClientSet, podName, f.Namespace.Name, time.Second*30)
+		err = waitForPodRunningInNamespaceTimeout(f.ClientSet, podName, f.Namespace.Name, time.Second*60)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		ginkgo.By("Removing the pod file from the nodes /etc/kubernetes/manifests")
 		framework.Logf("Removing %s from %s", podName, nodeName)
 		removeStaticPodFile(nodeName, podFile)
-		err = e2epod.WaitForPodNotFoundInNamespace(context.TODO(), f.ClientSet, podName, f.Namespace.Name, time.Second*30)
+		err = e2epod.WaitForPodNotFoundInNamespace(context.TODO(), f.ClientSet, podName, f.Namespace.Name, time.Second*60)
 		gomega.Expect(err).NotTo(gomega.HaveOccurred())
 	})
 })

test/e2e/status_manager.go

@@ -113,8 +113,8 @@ func checkEgressFirewallStatus(namespace string, empty bool, success bool, event
 		return empty && output == "" || success && strings.Contains(output, "EgressFirewall Rules applied")
 	}
 	if eventually {
-		gomega.Eventually(checkStatus, 1*time.Second, 100*time.Millisecond).Should(gomega.BeTrue())
+		gomega.Eventually(checkStatus, 5*time.Second, 100*time.Millisecond).Should(gomega.BeTrue())
 	} else {
-		gomega.Consistently(checkStatus, 1*time.Second, 100*time.Millisecond).Should(gomega.BeTrue())
+		gomega.Consistently(checkStatus, 5*time.Second, 100*time.Millisecond).Should(gomega.BeTrue())
 	}
 }

test/e2e/util.go

@@ -7,7 +7,6 @@ import (
 	"math/rand"
 	"net"
 	"os"
-	"os/exec"
 	"regexp"
 	"strconv"
 	"strings"
@@ -1409,7 +1408,7 @@ func waitForPodNotFoundInNamespace(ctx context.Context, c clientset.Interface, p
 }
 
 func isDefaultNetworkAdvertised() bool {
-	podNetworkValue, err := exec.Command("kubectl", "get", "ra", "default", "--template={{index .spec.advertisements 0}}").CombinedOutput()
+	podNetworkValue, err := e2ekubectl.RunKubectl("default", "get", "ra", "default", "--template={{index .spec.advertisements 0}}")
 	if err != nil {
 		return false
 	}