Cleanup up comments, added ssh retry, fixed permissions and added
default Kubernets version value.pull/239/head
parent
bc74b8596f
commit
d73082171c
|
@ -177,7 +177,7 @@ type MachineConfig struct {
|
|||
InsecureRegistry []string
|
||||
}
|
||||
|
||||
// MachineConfig contains the parameters used to start a cluster.
|
||||
// KubernetesConfig contains the parameters used to configure the VM Kubernetes.
|
||||
type KubernetesConfig struct {
|
||||
KubernetesVersion string
|
||||
}
|
||||
|
@ -227,8 +227,6 @@ var assets = []fileToCopy{
|
|||
}
|
||||
|
||||
func UpdateCluster(h sshAble, d drivers.Driver, config KubernetesConfig) error {
|
||||
//upgrade driver to a host
|
||||
//change the tests
|
||||
client, err := sshutil.NewSSHClient(d)
|
||||
if err != nil {
|
||||
return err
|
||||
|
@ -263,7 +261,6 @@ func UpdateCluster(h sshAble, d drivers.Driver, config KubernetesConfig) error {
|
|||
return err
|
||||
}
|
||||
}
|
||||
//localkube seperate
|
||||
return nil
|
||||
}
|
||||
|
||||
|
|
|
@ -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 &'
|
||||
`
|
||||
|
||||
var localkubeDownloadFmtStr = `
|
||||
curl -o /usr/local/bin/localkube %s
|
||||
`
|
||||
var localkubeDownloadFmtStr = `sudo curl -sSL --retry 5 -o /usr/local/bin/localkube %s && sudo chmod 0777 /usr/local/bin/localkube`
|
||||
|
||||
var logsCommand = fmt.Sprintf("tail -n +1 %s %s", constants.RemoteLocalKubeErrPath, constants.RemoteLocalKubeOutPath)
|
||||
|
||||
|
|
|
@ -21,6 +21,7 @@ import (
|
|||
|
||||
"k8s.io/kubernetes/pkg/client/unversioned/clientcmd"
|
||||
"k8s.io/kubernetes/pkg/util/homedir"
|
||||
"k8s.io/kubernetes/pkg/version"
|
||||
)
|
||||
|
||||
// MachineName is the name to use for the VM.
|
||||
|
@ -57,10 +58,10 @@ const (
|
|||
DefaultCPUS = 1
|
||||
DefaultDiskSize = "20g"
|
||||
DefaultVMDriver = "virtualbox"
|
||||
|
||||
DefaultKubernetesVersion = ""
|
||||
)
|
||||
|
||||
var DefaultKubernetesVersion = version.Get().GitVersion
|
||||
|
||||
const (
|
||||
RemoteLocalKubeErrPath = "/var/lib/localkube/localkube.err"
|
||||
RemoteLocalKubeOutPath = "/var/lib/localkube/localkube.out"
|
||||
|
|
Loading…
Reference in New Issue