From e9c1d1ebd685367ac345979a6b51e9a7a1518be0 Mon Sep 17 00:00:00 2001 From: Jimmi Dyson Date: Sun, 31 Jan 2016 23:27:34 +0000 Subject: [PATCH] Do not move pid 1 to system container --- pkg/kubelet/cm/container_manager_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index 31d016e9ca7..f4748e9cd18 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -387,7 +387,7 @@ func ensureSystemContainer(rootContainer *fs.Manager, manager *fs.Manager) error // Remove kernel pids and other protected PIDs (pid 1, PIDs already in system & kubelet containers) pids := make([]int, 0, len(allPids)) for _, pid := range allPids { - if isKernelPid(pid) { + if pid == 1 || isKernelPid(pid) { continue }