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

Cleanup up comments, added ssh retry, fixed permissions and added 

default Kubernets version value.
pull/239/head
aprindle 2016-06-30 10:10:49 -07:00 committed by Aaron Prindle
parent bc74b8596f
commit d73082171c
3 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/minikube/cluster/cluster.go
View File

@ -177,7 +177,7 @@ type MachineConfig struct {
InsecureRegistry []string InsecureRegistry []string
} }
// MachineConfig contains the parameters used to start a cluster. // KubernetesConfig contains the parameters used to configure the VM Kubernetes.
type KubernetesConfig struct { type KubernetesConfig struct {
KubernetesVersion string KubernetesVersion string
} }
@ -227,8 +227,6 @@ var assets = []fileToCopy{
} }
func UpdateCluster(h sshAble, d drivers.Driver, config KubernetesConfig) error { func UpdateCluster(h sshAble, d drivers.Driver, config KubernetesConfig) error {
//upgrade driver to a host
//change the tests
client, err := sshutil.NewSSHClient(d) client, err := sshutil.NewSSHClient(d)
if err != nil { if err != nil {
return err return err
@ -263,7 +261,6 @@ func UpdateCluster(h sshAble, d drivers.Driver, config KubernetesConfig) error {
return err return err
} }
} }
//localkube seperate
return nil return nil
} }

4
pkg/minikube/cluster/commands.go
View File

@ -32,9 +32,7 @@ var startCommandFmtStr = `
sudo sh -c 'PATH=/usr/local/sbin:$PATH nohup /usr/local/bin/localkube %s --generate-certs=false --logtostderr=true > %s 2> %s < /dev/null &' sudo sh -c 'PATH=/usr/local/sbin:$PATH nohup /usr/local/bin/localkube %s --generate-certs=false --logtostderr=true > %s 2> %s < /dev/null &'
` `
var localkubeDownloadFmtStr = ` var localkubeDownloadFmtStr = `sudo curl -sSL --retry 5 -o /usr/local/bin/localkube %s && sudo chmod 0777 /usr/local/bin/localkube`
curl -o /usr/local/bin/localkube %s
`
var logsCommand = fmt.Sprintf("tail -n +1 %s %s", constants.RemoteLocalKubeErrPath, constants.RemoteLocalKubeOutPath) var logsCommand = fmt.Sprintf("tail -n +1 %s %s", constants.RemoteLocalKubeErrPath, constants.RemoteLocalKubeOutPath)

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

@ -21,6 +21,7 @@ import (
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd" "k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
"k8s.io/kubernetes/pkg/util/homedir" "k8s.io/kubernetes/pkg/util/homedir"
"k8s.io/kubernetes/pkg/version"
) )
// MachineName is the name to use for the VM. // MachineName is the name to use for the VM.
@ -57,10 +58,10 @@ const (
DefaultCPUS = 1 DefaultCPUS = 1
DefaultDiskSize = "20g" DefaultDiskSize = "20g"
DefaultVMDriver = "virtualbox" DefaultVMDriver = "virtualbox"
DefaultKubernetesVersion = ""
) )
var DefaultKubernetesVersion = version.Get().GitVersion
const ( const (
RemoteLocalKubeErrPath = "/var/lib/localkube/localkube.err" RemoteLocalKubeErrPath = "/var/lib/localkube/localkube.err"
RemoteLocalKubeOutPath = "/var/lib/localkube/localkube.out" RemoteLocalKubeOutPath = "/var/lib/localkube/localkube.out"