From 6c9b4b21b77c12717d211b67bd80476a32562143 Mon Sep 17 00:00:00 2001 From: Judah Nouriyelian Date: Wed, 12 Jul 2023 19:27:36 +0000 Subject: [PATCH] refactor code and fix typos --- cmd/minikube/cmd/config/kubernetes_version.go | 8 ++------ cmd/minikube/cmd/start.go | 8 ++++---- pkg/minikube/reason/reason.go | 2 +- 3 files changed, 7 insertions(+), 11 deletions(-) diff --git a/cmd/minikube/cmd/config/kubernetes_version.go b/cmd/minikube/cmd/config/kubernetes_version.go index 9e4ef9fee7..10f427a825 100644 --- a/cmd/minikube/cmd/config/kubernetes_version.go +++ b/cmd/minikube/cmd/config/kubernetes_version.go @@ -43,16 +43,12 @@ func supportedKubernetesVersions() (releases []string) { func IsInGithubKubernetesVersions(ver string) (bool, error) { ghc := github.NewClient(nil) - release, resp, err := ghc.Repositories.GetReleaseByTag(context.Background(), "kubernetes", "kubernetes", ver) + _, resp, err := ghc.Repositories.GetReleaseByTag(context.Background(), "kubernetes", "kubernetes", ver) if err != nil { if resp != nil && resp.StatusCode == http.StatusNotFound { return false, nil } return false, err } - if release.GetTagName() == ver { - return true, nil - } - - return false, nil + return true, nil } diff --git a/cmd/minikube/cmd/start.go b/cmd/minikube/cmd/start.go index 4dd0949ed3..62dbba02a3 100644 --- a/cmd/minikube/cmd/start.go +++ b/cmd/minikube/cmd/start.go @@ -1724,13 +1724,13 @@ func validateKubernetesVersion(old *config.ClusterConfig) { out.WarningT("Specified Kubernetes version {{.specified}} not found in Kubernetes version list. Searching the internet...", out.V{"specified": nvs}) found, err := cmdcfg.IsInGithubKubernetesVersions(kubernetesVer) if err != nil && !viper.GetBool(force) { - exit.Error(reason.KubernetesNotConnect, "error fetching Kubernetes version list from Github", err) + exit.Error(reason.KubernetesNotConnect, "error fetching Kubernetes version list from GitHub", err) } if found { - out.Styled(style.Check, "Kubernetes version {{.specified}} found in Github version list", out.V{"specified": nvs}) + out.Styled(style.Check, "Kubernetes version {{.specified}} found in GitHub version list", out.V{"specified": nvs}) } else if !viper.GetBool(force) { - out.WarningT("Kubernetes version not found in Github version list. You can force a Kubernetes version via the --force flag") - exitIfNotForced(reason.KubernetesTooNew, "Kubernetes {{.version}} is not supported by this release of minikube", out.V{"version": nvs}) + out.WarningT("Kubernetes version not found in GitHub version list. You can force a Kubernetes version via the --force flag") + exitIfNotForced(reason.KubernetesTooNew, "Kubernetes version {{.version}} is not supported by this release of minikube", out.V{"version": nvs}) } } } diff --git a/pkg/minikube/reason/reason.go b/pkg/minikube/reason/reason.go index ada777d8fe..d54c9f2eb9 100644 --- a/pkg/minikube/reason/reason.go +++ b/pkg/minikube/reason/reason.go @@ -470,7 +470,7 @@ var ( KubernetesTooOld = Kind{ID: "K8S_OLD_UNSUPPORTED", ExitCode: ExControlPlaneUnsupported} // a too new Kubernetes version was specified for minikube to use KubernetesTooNew = Kind{ID: "K8S_NEW_UNSUPPORTED", ExitCode: ExControlPlaneUnsupported} - // error fetching github kubernetes version list + // error fetching GitHub Kubernetes version list KubernetesNotConnect = Kind{ID: "K8S_FAIL_CONNECT"} // minikube was unable to safely downgrade installed Kubernetes version KubernetesDowngrade = Kind{