github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #79338 from rafatio/automated-cherry-pick-of-#79073-upstream-release-1.14 

Automated cherry pick of #79073: Ignore cgroup pid support if related feature gates are
k3s-v1.14.4
Kubernetes Prow Robot 2019-06-29 04:29:25 -07:00 committed by GitHub
parent 55bca275e5 ed402e3629
commit 2fcb57ff05
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

@ -326,7 +326,7 @@ func getSupportedSubsystems() map[subsystem]bool {
supportedSubsystems := map[subsystem]bool{ supportedSubsystems := map[subsystem]bool{
&cgroupfs.MemoryGroup{}: true, &cgroupfs.MemoryGroup{}: true,
&cgroupfs.CpuGroup{}: true, &cgroupfs.CpuGroup{}: true,
&cgroupfs.PidsGroup{}: true, &cgroupfs.PidsGroup{}: false,
} }
// not all hosts support hugetlb cgroup, and in the absent of hugetlb, we will fail silently by reporting no capacity. // not all hosts support hugetlb cgroup, and in the absent of hugetlb, we will fail silently by reporting no capacity.
supportedSubsystems[&cgroupfs.HugetlbGroup{}] = false supportedSubsystems[&cgroupfs.HugetlbGroup{}] = false