scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-01 10:48:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #85218 from giuseppe/cgroupv2

Browse Source 
kubelet: add initial support for cgroupv2
This commit is contained in:
Kubernetes Prow Robot
2020-03-26 14:10:23 -07:00
committed by GitHub
parent a9f6b93b62 bb5ed1b797
commit 34c8b26c9f
4 changed files with 105 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -161,6 +161,10 @@ func validateSystemRequirements(mountUtil mount.Interface) (features, error) {
return f, fmt.Errorf("%s - %v", localErr, err)
}
if cgroups.IsCgroup2UnifiedMode() {
return f, nil
}
expectedCgroups := sets.NewString("cpu", "cpuacct", "cpuset", "memory")
for _, mountPoint := range mountPoints {
if mountPoint.Type == cgroupMountType {
@@ -884,6 +888,11 @@ func getContainer(pid int) (string, error) {
return "", err
}
if cgroups.IsCgroup2UnifiedMode() {
c, _ := cgs[""]
return c, nil
}
cpu, found := cgs["cpu"]
if !found {
return "", cgroups.NewNotFoundError("cpu")