Merge pull request #98365 from odinuge/cgroup-v2-systemd

Fix cgroup handling for systemd with cgroup v2
2021-03-04 14:40:34 -08:00
parent ae4f2ac43d 124de526cb
commit 413ff6751b
1 changed files with 1 additions and 1 deletions
--- a/pkg/kubelet/cm/cgroup_manager_linux.go
+++ b/pkg/kubelet/cm/cgroup_manager_linux.go
@@ -577,7 +577,7 @@ func (m *cgroupManagerImpl) Update(cgroupConfig *CgroupConfig) error {

 	unified := libcontainercgroups.IsCgroup2UnifiedMode()
 	if unified {
-		libcontainerCgroupConfig.Path = cgroupConfig.Name.ToCgroupfs()
+		libcontainerCgroupConfig.Path = m.Name(cgroupConfig.Name)
 	} else {
 		libcontainerCgroupConfig.Paths = m.buildCgroupPaths(cgroupConfig.Name)
 	}