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

Merge pull request #79900 from mikebrow/todo-cleanup-container-manager-linux

Browse Source 
update code documentation to reflect change in status
This commit is contained in:
Kubernetes Prow Robot 2019-07-11 18:33:35 -07:00 committed by GitHub
commit 923f08e29b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -432,13 +432,10 @@ func (cm *containerManagerImpl) setupNode(activePods ActivePodsFunc) error {
systemContainers := []*systemContainer{} systemContainers := []*systemContainer{}
if cm.ContainerRuntime == "docker" { if cm.ContainerRuntime == "docker" {
// With the docker-CRI integration, dockershim will manage the cgroups // With the docker-CRI integration, dockershim manages the cgroups
// and oom score for the docker processes. // and oom score for the docker processes.
// In the future, NodeSpec should mandate the cgroup that the // Check the cgroup for docker periodically, so kubelet can serve stats for the docker runtime.
// runtime processes need to be in. For now, we still check the // TODO(KEP#866): remove special processing for CRI "docker" enablement
// cgroup for docker periodically, so that kubelet can recognize
// the cgroup for docker and serve stats for the runtime.
// TODO(#27097): Fix this after NodeSpec is clearly defined.
cm.periodicTasks = append(cm.periodicTasks, func() { cm.periodicTasks = append(cm.periodicTasks, func() {
klog.V(4).Infof("[ContainerManager]: Adding periodic tasks for docker CRI integration") klog.V(4).Infof("[ContainerManager]: Adding periodic tasks for docker CRI integration")
cont, err := getContainerNameForProcess(dockerProcessName, dockerPidFile) cont, err := getContainerNameForProcess(dockerProcessName, dockerPidFile)