Merge pull request #60820 from janetkuo/ds-test-ondelete

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix DaemonSet e2e test for OnDelete **What this PR does / why we need it**: DaemonSet `OnDelete` e2e test is broken after #59883 is merged, because default update strategy is different in apps/v1 API endpoint. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: xref #60003 **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #60820 from janetkuo/ds-test-ondelete
01504f66 · Kubernetes Submit Queue · GitHub · f68eb1e1 · 79d7b425 · 01504f66
Unverified Commit 01504f66 authored Mar 05, 2018 by Kubernetes Submit Queue Committed by GitHub Mar 05, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

daemon_set.go test/e2e/apps/daemon_set.go +3 -1

No files found.
--- a/test/e2e/apps/daemon_set.go
+++ b/test/e2e/apps/daemon_set.go
@@ -269,7 +269,9 @@ var _ = SIGDescribe("Daemon set [Serial]", func() {
 		label := map[string]string{daemonsetNameLabel: dsName}
 		framework.Logf("Creating simple daemon set %s", dsName)
-		ds, err := c.AppsV1().DaemonSets(ns).Create(newDaemonSet(dsName, image, label))
+		ds := newDaemonSet(dsName, image, label)
+		ds.Spec.UpdateStrategy = apps.DaemonSetUpdateStrategy{Type: apps.OnDeleteDaemonSetStrategyType}
+		ds, err := c.AppsV1().DaemonSets(ns).Create(ds)
 		Expect(err).NotTo(HaveOccurred())
 		By("Check that daemon pods launch on every node of the cluster.")