github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #97888 from pacoxu/fix/97565

Browse Source 
check containerd as well as docker-containerd
This commit is contained in:
Kubernetes Prow Robot 2021-02-09 23:46:59 -08:00 committed by GitHub
commit d819199065
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/cm/container_manager_linux.go
View File

@ -71,9 +71,9 @@ import (
const ( const (
dockerProcessName = "dockerd" dockerProcessName = "dockerd"
// dockerd option --pidfile can specify path to use for daemon PID file, pid file path is default "/var/run/docker.pid"
dockerPidFile = "/var/run/docker.pid" dockerPidFile = "/var/run/docker.pid"
containerdProcessName = "docker-containerd" containerdProcessName = "containerd"
containerdPidFile = "/run/docker/libcontainerd/docker-containerd.pid"
maxPidFileLength = 1 << 10 // 1KB maxPidFileLength = 1 << 10 // 1KB
) )
@ -884,6 +884,8 @@ func EnsureDockerInContainer(dockerAPIVersion *utilversion.Version, oomScoreAdj
type process struct{ name, file string } type process struct{ name, file string }
dockerProcs := []process{{dockerProcessName, dockerPidFile}} dockerProcs := []process{{dockerProcessName, dockerPidFile}}
if dockerAPIVersion.AtLeast(containerdAPIVersion) { if dockerAPIVersion.AtLeast(containerdAPIVersion) {
// By default containerd is started separately, so there is no pid file.
containerdPidFile := ""
dockerProcs = append(dockerProcs, process{containerdProcessName, containerdPidFile}) dockerProcs = append(dockerProcs, process{containerdProcessName, containerdPidFile})
} }
var errs []error var errs []error