Skip to content

K
k3s
Unverified Commit 7151a59c authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

Merge pull request #75901 from neolit123/automated-cherry-pick-of-#75900-origin-release-1.14

Automated cherry pick of #75900: kubeadm: fix "upgrade plan" not working without k8s version
parents 9e2d66a1 275a7481
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
cmd/kubeadm/app/cmd/upgrade/common.go
View file @ 7151a59c
...@@ -154,7 +154,7 @@ func enforceRequirements(flags *applyPlanFlags, dryRun bool, newK8sVersion strin ...@@ -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 // 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 // printConfiguration prints the external version of the API to yaml
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment