Skip to content

K
k3s
Unverified Commit 2fcb57ff authored by Kubernetes Prow Robot's avatar Kubernetes Prow Robot Committed by GitHub
Browse files
Options

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
parents 55bca275 ed402e36
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
pkg/kubelet/cm/cgroup_manager_linux.go
View file @ 2fcb57ff
......@@ -326,7 +326,7 @@ func getSupportedSubsystems() map[subsystem]bool {
supportedSubsystems := map[subsystem]bool{
&cgroupfs.MemoryGroup{}: 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.
supportedSubsystems[&cgroupfs.HugetlbGroup{}] = false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment