Merge pull request #28755 from dubstack/remove-systemd-check

Automatic merge from submit-queue Do not skip check for cgroup creation in the systemd mount As soon as libcontainer dependency is update in #28410, we can skip check for cgroup creation in the systemd mount. As the latest version of libcontainer should create cgroups in the sytemd mount aswell. This is tied to the upstream issue: #27204 @vishh PTAL

Merge pull request #28755 from dubstack/remove-systemd-check
1d8c15ba · k8s-merge-robot · GitHub · 8eb0cf50 · 238f833f · 1d8c15ba
Commit 1d8c15ba authored Jul 18, 2016 by k8s-merge-robot Committed by GitHub Jul 18, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 4 deletions

cgroup_manager_linux.go pkg/kubelet/cm/cgroup_manager_linux.go +2 -4

No files found.
--- a/pkg/kubelet/cm/cgroup_manager_linux.go
+++ b/pkg/kubelet/cm/cgroup_manager_linux.go
@@ -54,10 +54,8 @@ func (m *cgroupManagerImpl) Exists(name string) bool {
 	}

 	// If even one cgroup doesn't exist we go on to create it
-	// @TODO(dubstack) We skip check for systemd until we update
-	// libcontainer in vendor
-	for key, path := range cgroupPaths {
-		if key != "systemd" && !libcontainercgroups.PathExists(path) {
+	for _, path := range cgroupPaths {
+		if !libcontainercgroups.PathExists(path) {
 			return false
 		}
 	}