From 52ccf54dab9aa831c15d843857b307fc0d484480 Mon Sep 17 00:00:00 2001 From: Mike Danese Date: Thu, 27 Aug 2015 10:18:21 -0700 Subject: [PATCH] Add daemon reaper test to kubectl --- test/e2e/daemon_set.go | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/test/e2e/daemon_set.go b/test/e2e/daemon_set.go index 43cf4fb83bb..727959a830f 100644 --- a/test/e2e/daemon_set.go +++ b/test/e2e/daemon_set.go @@ -24,6 +24,7 @@ import ( "k8s.io/kubernetes/pkg/apis/experimental" client "k8s.io/kubernetes/pkg/client/unversioned" "k8s.io/kubernetes/pkg/fields" + "k8s.io/kubernetes/pkg/kubectl" "k8s.io/kubernetes/pkg/labels" "k8s.io/kubernetes/pkg/util/wait" @@ -148,6 +149,15 @@ func testDaemonSets(f *Framework) { }, }) Expect(err).NotTo(HaveOccurred()) + defer func() { + Logf("Check that reaper kills all daemon pods for %s", simpleDSName) + dsReaper, err := kubectl.ReaperFor("DaemonSet", c) + Expect(err).NotTo(HaveOccurred()) + _, err = dsReaper.Stop(ns, simpleDSName, 0, nil) + Expect(err).NotTo(HaveOccurred()) + err = wait.Poll(retryInterval, retryTimeout, checkRunningOnNoNodes(f, label)) + Expect(err).NotTo(HaveOccurred(), "error waiting for daemon pod to be reaped") + }() By("Check that daemon pods launch on every node of the cluster.") Expect(err).NotTo(HaveOccurred()) @@ -218,4 +228,7 @@ func testDaemonSets(f *Framework) { Expect(err).NotTo(HaveOccurred()) Expect(wait.Poll(retryInterval, retryTimeout, checkRunningOnNoNodes(f, complexLabel))). NotTo(HaveOccurred(), "error waiting for daemon pod to not be running on nodes") + + By("We should now be able to delete the daemon set.") + Expect(c.DaemonSets(ns).Delete(complexDSName)).NotTo(HaveOccurred()) }