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

Lint fixes

pull/7115/head
Thomas Stromberg 2020-03-20 07:15:34 -07:00
parent ea6d6832e5
commit ff9c4fdcc6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/minikube/machine/client.go
View File

@ -172,6 +172,7 @@ func (api *LocalClient) Create(h *host.Host) error {
return fmt.Errorf("driver %q does not exist", h.DriverName)
}
if def.Init == nil {
// NOTE: This will call provision.DetectProvisioner
return api.legacyClient.Create(h)
}

6
pkg/provision/provision.go
View File

@ -69,7 +69,7 @@ func init() {
// NewSystemdProvisioner is our fork of the same name in the upstream provision library, without the packages
func NewSystemdProvisioner(osReleaseID string, d drivers.Driver) provision.SystemdProvisioner {
return provision.SystemdProvisioner{
provision.GenericProvisioner{
GenericProvisioner: provision.GenericProvisioner{
SSHCommander: provision.GenericSSHCommander{Driver: d},
DockerOptionsDir: "/etc/docker",
DaemonOptionsFile: "/etc/systemd/system/docker.service.d/10-machine.conf",
@ -292,12 +292,12 @@ func concatStrings(src []string, prefix string, postfix string) []string {
// updateUnit efficiently updates a systemd unit file
func updateUnit(p provision.SSHCommander, name string, content string, dst string) error {
glog.Infof("Updating %s ...", dst)
glog.Infof("Updating %s unit: %s ...", name, dst)
if _, err := p.SSHCommand(fmt.Sprintf("sudo mkdir -p %s && printf %%s \"%s\" | sudo tee %s.new", path.Dir(dst), content, dst)); err != nil {
return err
}
if _, err := p.SSHCommand(fmt.Sprintf("sudo diff -u %s %s.new || { sudo mv %s.new %s; sudo systemctl -f daemon-reload && sudo sudo systemctl -f restart docker; }", dst, dst, dst, dst)); err != nil {
if _, err := p.SSHCommand(fmt.Sprintf("sudo diff -u %s %s.new || { sudo mv %s.new %s; sudo systemctl -f daemon-reload && sudo sudo systemctl -f restart %s; }", dst, dst, dst, dst, name)); err != nil {
return err
}
return nil