Merge pull request #14915 from mikedanese/retry-fast

make update period for Node not a multiple of 5 in DaemonSet e2e to avoid version conflict

Merge pull request #14915 from mikedanese/retry-fast
fc36ac6c · Mike Danese · 2c81a664 · c9574560 · fc36ac6c
Commit fc36ac6c authored Oct 02, 2015 by Mike Danese
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

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

No files found.
--- a/test/e2e/daemon_set.go
+++ b/test/e2e/daemon_set.go
@@ -37,7 +37,9 @@ import (
 )

 const (
-	updateRetryPeriod    = 5 * time.Second
+	// this should not be a multiple of 5, because node status updates
+	// every 5 seconds. See https://github.com/kubernetes/kubernetes/pull/14915.
+	updateRetryPeriod    = 2 * time.Second
 	updateRetryTimeout   = 30 * time.Second
 	daemonsetLabelPrefix = "daemonset-"
 	daemonsetNameLabel   = daemonsetLabelPrefix + "name"