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

Review feedback

pull/1490/head
Matt Rickard 2017-05-16 15:31:15 -07:00
parent 652c4c668d
commit 7f294b2a54
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/minikube/kubernetes_versions/kubernetes_versions.go
View File

@ -65,7 +65,6 @@ var cachedK8sVersions = make(K8sReleases, 0)
func GetK8sVersionsFromURL(url string) (K8sReleases, error) { func GetK8sVersionsFromURL(url string) (K8sReleases, error) {
if len(cachedK8sVersions) != 0 { if len(cachedK8sVersions) != 0 {
glog.Infof("Using cached localkube versions: %v", cachedK8sVersions)
return cachedK8sVersions, nil return cachedK8sVersions, nil
} }
var k8sVersions K8sReleases var k8sVersions K8sReleases
@ -76,7 +75,6 @@ func GetK8sVersionsFromURL(url string) (K8sReleases, error) {
return K8sReleases{}, errors.Errorf("There were no json k8s Releases at the url specified: %s", url) return K8sReleases{}, errors.Errorf("There were no json k8s Releases at the url specified: %s", url)
} }
glog.Infoln("Caching localkube versions")
cachedK8sVersions = k8sVersions cachedK8sVersions = k8sVersions
return k8sVersions, nil return k8sVersions, nil
} }

3
pkg/util/utils.go
View File

@ -113,6 +113,9 @@ func GetLocalkubeDownloadURL(versionOrURL string, filename string) (string, erro
versionOrURL = "v" + versionOrURL versionOrURL = "v" + versionOrURL
} }
isValidVersion, err := kubernetes_versions.IsValidLocalkubeVersion(versionOrURL, constants.KubernetesVersionGCSURL) isValidVersion, err := kubernetes_versions.IsValidLocalkubeVersion(versionOrURL, constants.KubernetesVersionGCSURL)
if err != nil {
return "", errors.Wrap(err, "Error getting valid localkube versions")
}
if !isValidVersion { if !isValidVersion {
return "", errors.New("Not a valid localkube version to download") return "", errors.New("Not a valid localkube version to download")
} }