Merge pull request #18 from SergeyKanzhelev/pidLimitsGA

PidLimits promoted to GA
kubernetes · Sep 9, 2020 · 4c2c4b9 · 4c2c4b9
2 parents b790735 + 6069d2d
commit 4c2c4b9
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/validators/types_unix.go b/validators/types_unix.go
@@ -56,17 +56,14 @@ var DefaultSysSpec = SysSpec{
 		},
 		Forbidden: []KernelConfig{},
 	},
-	Cgroups: []string{"cpu", "cpuacct", "cpuset", "devices", "freezer", "memory"},
+	Cgroups: []string{"cpu", "cpuacct", "cpuset", "devices", "freezer", "memory", "pids"},
 	CgroupsOptional: []string{
 		// The hugetlb cgroup is optional since some kernels are compiled without support for huge pages
 		// and therefore lacks corresponding hugetlb cgroup
 		"hugetlb",
-		// The pids cgroup is optional since it is only used when at least one of the feature flags "SupportPodPidsLimit" and
-		// "SupportNodePidsLimit" is enabled
-		"pids",
 	},
-	CgroupsV2:         []string{"cpu", "cpuset", "devices", "freezer", "memory"},
-	CgroupsV2Optional: []string{"hugetlb", "pids"},
+	CgroupsV2:         []string{"cpu", "cpuset", "devices", "freezer", "memory", "pids"},
+	CgroupsV2Optional: []string{"hugetlb"},
 	RuntimeSpec: RuntimeSpec{
 		DockerSpec: &DockerSpec{
 			Version:     []string{`1\.1[1-3]\..*`, `17\.0[3,6,9]\..*`, `18\.0[6,9]\..*`, `19\.03\..*`},