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

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

Browse Source 
Fix cgroup handling for systemd with cgroup v2
This commit is contained in:
Kubernetes Prow Robot 2021-03-04 14:40:34 -08:00 committed by GitHub
commit 413ff6751b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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/cgroup_manager_linux.go
View File

@ -577,7 +577,7 @@ func (m *cgroupManagerImpl) Update(cgroupConfig *CgroupConfig) error {
unified := libcontainercgroups.IsCgroup2UnifiedMode() unified := libcontainercgroups.IsCgroup2UnifiedMode()
if unified { if unified {
libcontainerCgroupConfig.Path = cgroupConfig.Name.ToCgroupfs() libcontainerCgroupConfig.Path = m.Name(cgroupConfig.Name)
} else { } else {
libcontainerCgroupConfig.Paths = m.buildCgroupPaths(cgroupConfig.Name) libcontainerCgroupConfig.Paths = m.buildCgroupPaths(cgroupConfig.Name)
} }