From 45146cff4e2e2a9854bdbca800d5757c7bb8b037 Mon Sep 17 00:00:00 2001 From: yanxuean Date: Mon, 25 Sep 2017 15:19:20 +0800 Subject: [PATCH] Use arg cgroupRoot,not nodeConfig.CgroupRoot Using both arg cgroupRoot and nodeConfig.CgroupRoot is confused in function NewQOSContainerManager Signed-off-by: yanxuean --- pkg/kubelet/cm/qos_container_manager_linux.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/kubelet/cm/qos_container_manager_linux.go b/pkg/kubelet/cm/qos_container_manager_linux.go index 8cfea46ce6..4436b10af1 100644 --- a/pkg/kubelet/cm/qos_container_manager_linux.go +++ b/pkg/kubelet/cm/qos_container_manager_linux.go @@ -63,7 +63,7 @@ type qosContainerManagerImpl struct { func NewQOSContainerManager(subsystems *CgroupSubsystems, cgroupRoot string, nodeConfig NodeConfig) (QOSContainerManager, error) { if !nodeConfig.CgroupsPerQOS { return &qosContainerManagerNoop{ - cgroupRoot: CgroupName(nodeConfig.CgroupRoot), + cgroupRoot: CgroupName(cgroupRoot), }, nil }