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

lint

pull/7570/head
Medya Gh 2020-04-09 21:01:49 -07:00
parent f7f04a83c2
commit 983808f956
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/drivers/common.go
View File

@ -125,8 +125,8 @@ func MakeDiskImage(d *drivers.BaseDriver, boot2dockerURL string, diskSize int) e
return nil
}
// KillApiServerProc will kill an api server proc if it exists
func KillApiServerProc(runner command.Runner) error {
// KillAPIServerProc will kill an api server proc if it exists
func KillAPIServerProc(runner command.Runner) error {
// first check if it exists
rr, err := runner.RunCmd(exec.Command("pgrep", "kube-apiserver"))
if err == nil { // this means we might have a running kube-apiserver

2
pkg/drivers/kic/kic.go
View File

@ -357,7 +357,7 @@ func (d *Driver) Stop() error {
}
if err := pkgdrivers.KillApiServerProc(d.exec); err != nil {
if err := pkgdrivers.KillAPIServerProc(d.exec); err != nil {
glog.Warningf("couldn't stop kube-apiserver proc: %v", err)
}

2
pkg/drivers/none/none.go
View File

@ -172,7 +172,7 @@ func (d *Driver) Kill() error {
return nil
}
if err := d.runtime.KillContainers(containers); err != nil {
if err := pkgdrivers.KillApiServerProc(d.exec); err != nil {
if err := pkgdrivers.KillAPIServerProc(d.exec); err != nil {
glog.Warningf("couldn't stop kube-apiserver proc: %v", err)
}
return errors.Wrap(err, "kill")