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
This commit is contained in:
Mike Danese 2015-10-02 15:58:22 -07:00
commit fc36ac6c8e

View File

@ -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"