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

Merge pull request #1969 from r2d4/kubeadm-use-right-kubelet 

Don't check kubernetes-version for kubeadm
pull/1970/head
Matt Rickard 2017-09-15 11:46:30 -07:00 committed by GitHub
parent e654879413 ac7d49c124
commit 17ecbcd76e
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -115,7 +115,8 @@ func runStart(cmd *cobra.Command, args []string) {
os.Exit(1)
}
if k8sVersion != constants.DefaultKubernetesVersion {
// Don't verify version for kubeadm bootstrapped clusters
if k8sVersion != constants.DefaultKubernetesVersion && clusterBootstrapper != bootstrapper.BootstrapperTypeKubeadm {
validateK8sVersion(k8sVersion)
}

6
pkg/minikube/constants/constants.go
View File

@ -153,8 +153,10 @@ const (
func GetKubernetesReleaseURL(binaryName, version string) string {
// TODO(r2d4): change this to official releases when the alpha controlplane commands are released.
// We are working with unreleased kubeadm changes at HEAD.
return fmt.Sprintf("https://storage.googleapis.com/minikube-builds/v1.7.3/%s", binaryName)
// return fmt.Sprintf("https://storage.googleapis.com/kubernetes-release/release/%s/bin/linux/amd64/%s", version, binaryName)
if binaryName == "kubeadm" {
return "https://storage.googleapis.com/minikube/kubeadm/kubeadm"
}
return fmt.Sprintf("https://storage.googleapis.com/kubernetes-release/release/%s/bin/linux/amd64/%s", version, binaryName)
}
func GetKubernetesReleaseURLSha1(binaryName, version string) string {