Merge pull request #65029 from detiber/timeoutIncrease

Automatic merge from submit-queue. kubeadm - increase upgrade manifest timeout **What this PR does / why we need it**: Backports the manifest upgrade timeout from https://github.com/kubernetes/kubernetes/pull/64988 to v1.10 **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes https://github.com/kubernetes/kubeadm/issues/850 **Release note**: ```release-note kubeadm - Increase the manifest upgrade timeout to make upgrades more reliable. ```

Merge pull request #65029 from detiber/timeoutIncrease
48c3adc1 · Kubernetes Submit Queue · GitHub · db6dfcc8 · 81f0f516 · 48c3adc1
Unverified Commit 48c3adc1 authored Jun 13, 2018 by Kubernetes Submit Queue Committed by GitHub Jun 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

apply.go cmd/kubeadm/app/cmd/upgrade/apply.go +1 -1

No files found.
--- a/cmd/kubeadm/app/cmd/upgrade/apply.go
+++ b/cmd/kubeadm/app/cmd/upgrade/apply.go
@@ -40,7 +40,7 @@ import (
 )

 const (
-	upgradeManifestTimeout = 1 * time.Minute
+	upgradeManifestTimeout = 5 * time.Minute
 )

 // applyFlags holds the information about the flags that can be passed to apply