Merge pull request kubernetes#75900 from neolit123/fix-upgrade-plan

k8s-ci-robot · web-flow · commit 8f304510c534 · 2019-03-30T12:47:08.000-07:00
kubeadm: fix "upgrade plan" not defaulting to a "stable" version
diff --git a/cmd/kubeadm/app/cmd/upgrade/common.go b/cmd/kubeadm/app/cmd/upgrade/common.go
@@ -154,7 +154,7 @@ func enforceRequirements(flags *applyPlanFlags, dryRun bool, newK8sVersion strin
 	}
 
 	// Use a real version getter interface that queries the API server, the kubeadm client and the Kubernetes CI system for latest versions
-	return client, upgrade.NewOfflineVersionGetter(upgrade.NewKubeVersionGetter(client, os.Stdout), cfg.KubernetesVersion), cfg, nil
+	return client, upgrade.NewOfflineVersionGetter(upgrade.NewKubeVersionGetter(client, os.Stdout), newK8sVersion), cfg, nil
 }
 
 // printConfiguration prints the external version of the API to yaml

Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ func enforceRequirements(flags *applyPlanFlags, dryRun bool, newK8sVersion strin`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`// Use a real version getter interface that queries the API server, the kubeadm client and the Kubernetes CI system for latest versions`
`157`		`- return client, upgrade.NewOfflineVersionGetter(upgrade.NewKubeVersionGetter(client, os.Stdout), cfg.KubernetesVersion), cfg, nil`
	`157`	`+ return client, upgrade.NewOfflineVersionGetter(upgrade.NewKubeVersionGetter(client, os.Stdout), newK8sVersion), cfg, nil`
`158`	`158`	`}`
`159`	`159`
`160`	`160`	`// printConfiguration prints the external version of the API to yaml`