Merge pull request #30087 from dims/remove-pkill-dependency

Automatic merge from submit-queue

Remove kubelet pkill dependency

Issue #26093 identified pkill as one of the dependencies of kublet
which could be worked around.  Build on the code introduced for pidof
and regexp for the process(es) we need to send a signal to.

Related to #26093
This commit is contained in:
Kubernetes Submit Queue
2016-08-12 18:38:38 -07:00
committed by GitHub
4 changed files with 69 additions and 5 deletions

View File

@@ -527,7 +527,7 @@ func getPidsForProcess(name, pidFile string) ([]int, error) {
runtime.HandleError(err)
}
}
return procfs.PidOf(name), nil
return procfs.PidOf(name)
}
// Ensures that the Docker daemon is in the desired container.