kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

modified so alerts user that the patch version is assumed

pull/16569/head
Judah Nouriyelian 2023-05-24 16:44:14 +00:00
parent a81e4f76ac
commit 3afc728238
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cmd/minikube/cmd/start.go
View File

@ -1659,6 +1659,13 @@ func validateKubernetesVersion(old *config.ClusterConfig) {
newestVersion := semver.MustParse(strings.TrimPrefix(constants.NewestKubernetesVersion, version.VersionPrefix))
zeroVersion := semver.MustParse(strings.TrimPrefix(constants.NoKubernetesVersion, version.VersionPrefix))
paramVersion := viper.GetString(kubernetesVersion)
paramVersion = strings.TrimPrefix(paramVersion, version.VersionPrefix)
isMajorMinorOnly, _ := getSemverFromMajorMinorOnly(paramVersion)
if isMajorMinorOnly {
out.Step(style.Workaround, `Using Kubernetes {{.version}} since patch version was unspecified`, out.V{"version": nvs})
}
if nvs.Equals(zeroVersion) {
klog.Infof("No Kubernetes version set for minikube, setting Kubernetes version to %s", constants.NoKubernetesVersion)
return
@ -1758,14 +1765,9 @@ $ minikube config unset kubernetes-version`)
paramVersion = constants.NewestKubernetesVersion
}
kubernetesSemver := strings.TrimPrefix(paramVersion, version.VersionPrefix)
majorMinorOnly := regexp.MustCompile(`^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)$`)
if majorMinorOnly.MatchString(kubernetesSemver) {
for _, k := range constants.ValidKubernetesVersions {
if strings.HasPrefix(k, fmt.Sprintf("v%s", kubernetesSemver)) {
kubernetesSemver = strings.TrimPrefix(k, version.VersionPrefix)
break
}
}
isMajorMinor, semverFromMajorMinor := getSemverFromMajorMinorOnly(kubernetesSemver)
if isMajorMinor {
kubernetesSemver = semverFromMajorMinor
}
nvs, err := semver.Make(kubernetesSemver)
if err != nil {
@ -1887,3 +1889,15 @@ func exitGuestProvision(err error) {
}
exit.Error(reason.GuestProvision, "error provisioning guest", err)
}
func getSemverFromMajorMinorOnly(kubernetesSemver string) (bool, string) {
majorMinorOnly := regexp.MustCompile(`^(?P<major>0|[1-9]\d*)\.(?P<minor>0|[1-9]\d*)$`)
if majorMinorOnly.MatchString(kubernetesSemver) {
for _, k := range constants.ValidKubernetesVersions {
if strings.HasPrefix(k, fmt.Sprintf("v%s", kubernetesSemver)) {
return true, strings.TrimPrefix(k, version.VersionPrefix)
}
}
}
return false, ""
}