Don't look for DNS by name. It might be coredns or kubedns.

Signed-off-by: dlorenc <dlorenc@google.com>
kubernetes · Aug 21, 2018 · 0a5efe1 · 0a5efe1
1 parent bd9230f
commit 0a5efe1
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 21 deletions.
diff --git a/test/integration/cluster_dns_test.go b/test/integration/cluster_dns_test.go
@@ -31,9 +31,6 @@ import (
 
 func testClusterDNS(t *testing.T) {
 	t.Parallel()
-	if err := util.WaitForDNSRunning(t); err != nil {
-		t.Fatalf("Waiting for DNS to be running: %s", err)
-	}
 
 	kubectlRunner := util.NewKubectlRunner(t)
 	podPath := filepath.Join(*testdataDir, "busybox.yaml")

diff --git a/test/integration/util/util.go b/test/integration/util/util.go
@@ -225,24 +225,6 @@ func WaitForBusyboxRunning(t *testing.T, namespace string) error {
 	return commonutil.WaitForPodsWithLabelRunning(client, namespace, selector)
 }
 
-func WaitForDNSRunning(t *testing.T) error {
-	client, err := commonutil.GetClient()
-	if err != nil {
-		return errors.Wrap(err, "getting kubernetes client")
-	}
-
-	selector := labels.SelectorFromSet(labels.Set(map[string]string{"k8s-app": "kube-dns"}))
-	if err := commonutil.WaitForPodsWithLabelRunning(client, "kube-system", selector); err != nil {
-		return errors.Wrap(err, "waiting for kube-dns pods")
-	}
-
-	if err := commonutil.WaitForService(client, "kube-system", "kube-dns", true, time.Millisecond*500, time.Minute*10); err != nil {
-		t.Errorf("Error waiting for kube-dns service to be up")
-	}
-
-	return nil
-}
-
 func WaitForDashboardRunning(t *testing.T) error {
 	client, err := commonutil.GetClient()
 	if err != nil {