github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-30 15:05:27 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-06 04:06:42 -08:00
commit c8e5e89491
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/cm/container_manager_linux.go
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) // Remove kernel pids and other protected PIDs (pid 1, PIDs already in system & kubelet containers)
pids := make([]int, 0, len(allPids)) pids := make([]int, 0, len(allPids))
for _, pid := range allPids { for _, pid := range allPids {
if isKernelPid(pid) { if pid == 1 || isKernelPid(pid) {
continue continue
} }