From 6da266784a9e6503a77c73832ac3936184001354 Mon Sep 17 00:00:00 2001 From: Mike Brown Date: Mon, 8 Jul 2019 16:15:59 -0500 Subject: [PATCH] update code documentation to reflect change in status Signed-off-by: Mike Brown --- pkg/kubelet/cm/container_manager_linux.go | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index 92575867560..43365f6f725 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -431,13 +431,10 @@ func (cm *containerManagerImpl) setupNode(activePods ActivePodsFunc) error { systemContainers := []*systemContainer{} 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. - // In the future, NodeSpec should mandate the cgroup that the - // runtime processes need to be in. For now, we still check the - // 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. + // Check the cgroup for docker periodically, so kubelet can serve stats for the docker runtime. + // TODO(KEP#866): remove special processing for CRI "docker" enablement cm.periodicTasks = append(cm.periodicTasks, func() { klog.V(4).Infof("[ContainerManager]: Adding periodic tasks for docker CRI integration") cont, err := getContainerNameForProcess(dockerProcessName, dockerPidFile)