Merge pull request #3596 from flyingcircle/master

tstromberg · web-flow · commit aec8c78f5df5 · 2019-03-25T18:59:50.000-07:00
Issue #3253, improve kubernetes-version error string
diff --git a/pkg/minikube/bootstrapper/kubeadm/versions.go b/pkg/minikube/bootstrapper/kubeadm/versions.go
@@ -163,7 +163,7 @@ func ParseKubernetesVersion(version string) (semver.Version, error) {
 	// Strip leading 'v' prefix from version for semver parsing
 	v, err := semver.Make(version[1:])
 	if err != nil {
-		return semver.Version{}, errors.Wrap(err, "parsing kubernetes version")
+		return semver.Version{}, errors.Wrap(err, "invalid version, must begin with 'v'")
 	}
 
 	return v, nil

Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ func ParseKubernetesVersion(version string) (semver.Version, error) {`
`163`	`163`	`// Strip leading 'v' prefix from version for semver parsing`
`164`	`164`	`v, err := semver.Make(version[1:])`
`165`	`165`	`if err != nil {`
`166`		`- return semver.Version{}, errors.Wrap(err, "parsing kubernetes version")`
	`166`	`+ return semver.Version{}, errors.Wrap(err, "invalid version, must begin with 'v'")`
`167`	`167`	`}`
`168`	`168`
`169`	`169`	`return v, nil`