Skip to content

Commit ef626c2

Browse files
committed
Initial proptotyping for kubernetes#2570
1 parent cd19c51 commit ef626c2

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

cmd/minikube/cmd/start.go

+5-2
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ func initMinikubeFlags() {
179179

180180
// initKubernetesFlags inits the commandline flags for kubernetes related options
181181
func initKubernetesFlags() {
182-
startCmd.Flags().String(kubernetesVersion, constants.DefaultKubernetesVersion, "The kubernetes version that the minikube VM will use (ex: v1.2.3)")
182+
startCmd.Flags().String(kubernetesVersion, "", "The kubernetes version that the minikube VM will use (ex: v1.2.3)")
183183
startCmd.Flags().Var(&extraOptions, "extra-config",
184184
`A set of key=value pairs that describe configuration that may be passed to different components.
185185
The key should be '.' separated, and the first part before the dot is the component to apply the configuration to.
@@ -1063,6 +1063,9 @@ func getKubernetesVersion(old *cfg.Config) (string, bool) {
10631063
isUpgrade := false
10641064
if rawVersion == "" {
10651065
rawVersion = constants.DefaultKubernetesVersion
1066+
if ( old.KubernetesConfig.KubernetesVersion != "" ) {
1067+
rawVersion = old.KubernetesConfig.KubernetesVersion
1068+
}
10661069
}
10671070

10681071
nvs, err := semver.Make(strings.TrimPrefix(rawVersion, version.VersionPrefix))
@@ -1107,7 +1110,7 @@ func getKubernetesVersion(old *cfg.Config) (string, bool) {
11071110
* Reuse the existing cluster with Kubernetes v{{.old}} or newer: Run "minikube start {{.profile}} --kubernetes-version={{.old}}"`, out.V{"new": nvs, "old": ovs, "profile": profileArg})
11081111

11091112
}
1110-
if nvs.GT(ovs) {
1113+
if ( nvs.GT(ovs) && viper.GetString(kubernetesVersion)!="") {
11111114
out.T(out.ThumbsUp, "Upgrading from Kubernetes {{.old}} to {{.new}}", out.V{"old": ovs, "new": nvs})
11121115
isUpgrade = true
11131116
}

0 commit comments

Comments
 (0)