Remove Helm install from kubedns suite

integration/helm_test.go

@@ -42,3 +42,13 @@ func (s *HelmSuite) TestACLEnabled(c *check.C) {
 	s.waitForMaeshControllerStarted(c)
 	s.waitForMaeshProxyStarted(c)
 }
+
+func (s *HelmSuite) TestKubeDNSEnabled(c *check.C) {
+	err := s.installHelmMaesh(c, false, true)
+	c.Assert(err, checker.IsNil)
+
+	defer s.unInstallHelmMaesh(c)
+
+	s.waitForMaeshControllerStarted(c)
+	s.waitForMaeshProxyStarted(c)
+}

integration/integration_test.go

@@ -307,6 +307,10 @@ func (s *BaseSuite) startAndWaitForKubeDNS(c *check.C) {
 	c.Assert(s.try.WaitReadyDeployment("kube-dns", metav1.NamespaceSystem, 60*time.Second), checker.IsNil)
 }
 
+func (s *BaseSuite) WaitForKubeDNS(c *check.C) {
+	c.Assert(s.try.WaitReadyDeployment("kube-dns", metav1.NamespaceSystem, 60*time.Second), checker.IsNil)
+}
+
 func (s *BaseSuite) waitForMaeshControllerStarted(c *check.C) {
 	c.Assert(s.try.WaitReadyDeployment("maesh-controller", maeshNamespace, 30*time.Second), checker.IsNil)
 }
@@ -319,10 +323,6 @@ func (s *BaseSuite) waitForTools(c *check.C) {
 	c.Assert(s.try.WaitReadyDeployment("tiny-tools", testNamespace, 30*time.Second), checker.IsNil)
 }
 
-func (s *BaseSuite) waitKubectlExecCommand(c *check.C, argSlice []string, data string) {
-	c.Assert(s.try.WaitCommandExecute("kubectl", argSlice, data, 10*time.Second), checker.IsNil)
-}
-
 func (s *BaseSuite) waitKubectlExecCommandReturn(_ *check.C, argSlice []string) (string, error) {
 	return s.try.WaitCommandExecuteReturn("kubectl", argSlice, 10*time.Second)
 }
@@ -519,10 +519,25 @@ func (s *BaseSuite) digHost(c *check.C, source, namespace, destination string) {
 		"exec", "-i", source, "-n", namespace, "--", "dig", destination, "+short",
 	}
 
-	output, err := s.waitKubectlExecCommandReturn(c, argSlice)
-	c.Assert(err, checker.IsNil)
-	c.Log(fmt.Sprintf("Dig %s: %s", destination, strings.TrimSpace(output)))
-	IP := net.ParseIP(strings.TrimSpace(output))
+	var IP net.IP
+
+	ebo := backoff.NewExponentialBackOff()
+	ebo.MaxElapsedTime = 60 * time.Second
+
+	_ = backoff.Retry(safe.OperationWithRecover(func() error {
+		output, err := s.waitKubectlExecCommandReturn(c, argSlice)
+		if err != nil {
+			return err
+		}
+		c.Log(fmt.Sprintf("Dig %s: %s", destination, strings.TrimSpace(output)))
+		IP = net.ParseIP(strings.TrimSpace(output))
+		if IP == nil {
+			return fmt.Errorf("could not parse an IP from dig")
+		}
+
+		return nil
+	}), ebo)
+
 	c.Assert(IP, checker.NotNil)
 }
 

integration/kubedns_test.go

@@ -1,6 +1,8 @@
 package integration
 
 import (
+	"time"
+
 	"github.com/go-check/check"
 	checker "github.com/vdemeester/shakers"
 )
@@ -19,30 +21,33 @@ func (s *KubeDNSSuite) SetUpSuite(c *check.C) {
 	}
 	s.startk3s(c, requiredImages)
 	s.startAndWaitForKubeDNS(c)
+
+	// Wait for our created coreDNS deployment in the maesh namespace.
+	c.Assert(s.try.WaitReadyDeployment("coredns", maeshNamespace, 60*time.Second), checker.IsNil)
+
 	s.startWhoami(c)
 	s.installTinyToolsMaesh(c)
+	s.createResources(c, "testdata/state-table/")
+	s.createResources(c, "testdata/smi/crds/")
 }
 
 func (s *KubeDNSSuite) TearDownSuite(c *check.C) {
 	s.stopK3s()
 }
 
-func (s *KubeDNSSuite) TestKubeDNS(c *check.C) {
-	pod := s.getToolsPodMaesh(c)
-	c.Assert(pod, checker.NotNil)
+func (s *KubeDNSSuite) TestKubeDNSDig(c *check.C) {
+	s.WaitForKubeDNS(c)
 
-	argSlice := []string{
-		"exec", "-it", pod.Name, "-n", pod.Namespace, "-c", pod.Spec.Containers[0].Name, "--", "curl", "whoami.whoami.svc.cluster.local", "--max-time", "5",
-	}
+	cmd := s.startMaeshBinaryCmd(c, false, false)
+	err := cmd.Start()
 
-	err := s.installHelmMaesh(c, false, true)
 	c.Assert(err, checker.IsNil)
-	s.waitForMaeshControllerStarted(c)
-	s.waitKubectlExecCommand(c, argSlice, "whoami")
+	defer s.stopMaeshBinary(c, cmd.Process)
 
-	argSlice = []string{
-		"exec", "-it", pod.Name, "-n", pod.Namespace, "-c", pod.Spec.Containers[0].Name, "--", "curl", "whoami.whoami.maesh", "--max-time", "5",
-	}
-	s.waitKubectlExecCommand(c, argSlice, "whoami")
-	s.unInstallHelmMaesh(c)
+	pod := s.getToolsPodMaesh(c)
+	c.Assert(pod, checker.NotNil)
+
+	// We need to wait for kubeDNS again, as the pods will be restarted by prepare.
+	s.WaitForKubeDNS(c)
+	s.digHost(c, pod.Name, pod.Namespace, "whoami.whoami.maesh")
 }