github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
k8s-merge-robot 2016-07-18 15:05:51 -07:00 committed by GitHub
commit 1d8c15ba14
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/cm/cgroup_manager_linux.go
View File

@ -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
}
}