From 5a64977d82a02b424992afce545659eb939bfb22 Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Mon, 1 Aug 2016 17:21:12 -0700 Subject: [PATCH] Resolve docker-daemon cgroup issue for both systemd and non-systemd node for node e2e tests. --- test/e2e_node/e2e_service.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/test/e2e_node/e2e_service.go b/test/e2e_node/e2e_service.go index 37914d2c91..3d68d54aba 100644 --- a/test/e2e_node/e2e_service.go +++ b/test/e2e_node/e2e_service.go @@ -239,6 +239,10 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) { } } else { cmdArgs = append(cmdArgs, getKubeletServerBin()) + cmdArgs = append(cmdArgs, + "--runtime-cgroups=/docker-daemon", + "--kubelet-cgroups=/kubelet", + ) } cmdArgs = append(cmdArgs, "--api-servers", "http://127.0.0.1:8080",