Merge pull request #45515 from derekwaynecarr/ignore-openrc

Automatic merge from submit-queue (batch tested with PRs 45515, 45579) Ignore openrc cgroup **What this PR does / why we need it**: It is a work-around for the following: https://github.com/opencontainers/runc/issues/1440 **Special notes for your reviewer**: I am open to a cleaner way to do this, but we have many developer users on Macs that ran containerized kubelets that are not able to run them right now due to the inclusion of openrc tripping up our existence checks. Ideally, runc can give us a call to say "does this exist according to what runc knows about". Or we could add a whitelist check. Right now, this was the smallest hack pending more discussion.

Merge pull request #45515 from derekwaynecarr/ignore-openrc
873ce9ca · Kubernetes Submit Queue · GitHub · c2f6ccf0 · 4e002eac · 873ce9ca
Commit 873ce9ca authored May 10, 2017 by Kubernetes Submit Queue Committed by GitHub May 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 13 additions and 1 deletion

cgroup_manager_linux.go pkg/kubelet/cm/cgroup_manager_linux.go +13 -1

No files found.
--- a/pkg/kubelet/cm/cgroup_manager_linux.go
+++ b/pkg/kubelet/cm/cgroup_manager_linux.go
@@ -227,8 +227,20 @@ func (m *cgroupManagerImpl) Exists(name CgroupName) bool {
 	// Get map of all cgroup paths on the system for the particular cgroup
 	cgroupPaths := m.buildCgroupPaths(name)
+	// the presence of alternative control groups not known to runc confuses
+	// the kubelet existence checks.
+	// ideally, we would have a mechaninsm in runc to support Exists() logic
+	// scoped to the set control groups it understands.  this is being discussed
+	// in https://github.com/opencontainers/runc/issues/1440
+	// once resolved, we can remove this code.
+	whitelistControllers := sets.NewString("cpu", "cpuacct", "cpuset", "memory", "hugetlb", "systemd")
 	// If even one cgroup path doesn't exist, then the cgroup doesn't exist.
-	for _, path := range cgroupPaths {
+	for controller, path := range cgroupPaths {
+		// ignore mounts we dont care about
+		if !whitelistControllers.Has(controller) {
+			continue
+		}
 		if !libcontainercgroups.PathExists(path) {
 			return false
 		}