Resolve docker-daemon cgroup issue for both systemd and non-systemd node for node e2e tests.

5a64977d · Dawn Chen · ed763b80 · 5a64977d
Commit 5a64977d authored Aug 01, 2016 by Dawn Chen
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

e2e_service.go test/e2e_node/e2e_service.go +4 -0

No files found.
--- 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",