Merge pull request #20395 from jimmidyson/system-container-fix

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-06 04:06:42 -08:00
commit c8e5e89491

View File

@ -405,7 +405,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
}