UPSTREAM: google/cadvisor: <drop>: Hack around cgroup load

Running containerized on RHEL7 exposes a cAdvisor bug google/cadvisor#1461 where the cgroup path given by docker (cpuacct,cpu) is used in preference to the cgroup path mounted in with -v /sys:/sys. This commit skips all cgroup paths that have a comma until we have a real fix in libcontainer and cadvisor.
openshift · Sep 16, 2016 · 9607748 · 9607748
1 parent d804d1f
commit 9607748
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go b/vendor/github.com/opencontainers/runc/libcontainer/cgroups/utils.go
diff --git a/vendor/k8s.io/kubernetes/test/e2e/framework/kubelet_stats.go b/vendor/k8s.io/kubernetes/test/e2e/framework/kubelet_stats.go