github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm-upgrade: notify the user of manifest upgrade timeouts

Browse Source 
Signed-off-by: Xianglin Gao <xianglin.gxl@alibaba-inc.com>
This commit is contained in:
Xianglin Gao 2018-06-16 22:02:47 +08:00
parent 410941b40c
commit b309ace793
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/kubeadm/app/cmd/upgrade/apply.go
View File

@ -42,8 +42,6 @@ import (
) )
const ( const (
upgradeManifestTimeout = 5 * time.Minute
defaultImagePullTimeout = 15 * time.Minute defaultImagePullTimeout = 15 * time.Minute
) )

2
cmd/kubeadm/app/cmd/upgrade/common.go
View File

@ -178,7 +178,7 @@ func getWaiter(dryRun bool, client clientset.Interface) apiclient.Waiter {
if dryRun { if dryRun {
return dryrunutil.NewWaiter() return dryrunutil.NewWaiter()
} }
return apiclient.NewKubeWaiter(client, upgradeManifestTimeout, os.Stdout) return apiclient.NewKubeWaiter(client, upgrade.UpgradeManifestTimeout, os.Stdout)
} }
// InteractivelyConfirmUpgrade asks the user whether they _really_ want to upgrade. // InteractivelyConfirmUpgrade asks the user whether they _really_ want to upgrade.

6
cmd/kubeadm/app/phases/upgrade/staticpods.go
View File

@ -33,6 +33,11 @@ import (
"k8s.io/kubernetes/pkg/util/version" "k8s.io/kubernetes/pkg/util/version"
) )
const (
// UpgradeManifestTimeout is timeout of upgrading the static pod manifest
UpgradeManifestTimeout = 5 * time.Minute
)
// StaticPodPathManager is responsible for tracking the directories used in the static pod upgrade transition // StaticPodPathManager is responsible for tracking the directories used in the static pod upgrade transition
type StaticPodPathManager interface { type StaticPodPathManager interface {
// MoveFile should move a file from oldPath to newPath // MoveFile should move a file from oldPath to newPath
@ -228,6 +233,7 @@ func upgradeComponent(component string, waiter apiclient.Waiter, pathMgr StaticP
if waitForComponentRestart { if waitForComponentRestart {
fmt.Println("[upgrade/staticpods] Waiting for the kubelet to restart the component") fmt.Println("[upgrade/staticpods] Waiting for the kubelet to restart the component")
fmt.Printf("[upgrade/staticpods] This might take a minute or longer depending on the component/version gap (timeout %v\n", UpgradeManifestTimeout)
// Wait for the mirror Pod hash to change; otherwise we'll run into race conditions here when the kubelet hasn't had time to // Wait for the mirror Pod hash to change; otherwise we'll run into race conditions here when the kubelet hasn't had time to
// notice the removal of the Static Pod, leading to a false positive below where we check that the API endpoint is healthy // notice the removal of the Static Pod, leading to a false positive below where we check that the API endpoint is healthy