Merge pull request #18836 from mikedanese/daemon-set

increase timeout on complex daemonset test
This commit is contained in:
Mike Danese 2015-12-18 08:06:26 -08:00
commit cd8dfe70d9

View File

@ -39,7 +39,7 @@ const (
// this should not be a multiple of 5, because node status updates // this should not be a multiple of 5, because node status updates
// every 5 seconds. See https://github.com/kubernetes/kubernetes/pull/14915. // every 5 seconds. See https://github.com/kubernetes/kubernetes/pull/14915.
dsRetryPeriod = 2 * time.Second dsRetryPeriod = 2 * time.Second
dsRetryTimeout = 1 * time.Minute dsRetryTimeout = 3 * time.Minute
daemonsetLabelPrefix = "daemonset-" daemonsetLabelPrefix = "daemonset-"
daemonsetNameLabel = daemonsetLabelPrefix + "name" daemonsetNameLabel = daemonsetLabelPrefix + "name"