Merge pull request #29890 from dchen1107/test1

Automatic merge from submit-queue Resolve docker-daemon cgroup issue for both systemd and non-systemd node for node e2e tests Fixed https://github.com/kubernetes/kubernetes/issues/29827 cc/ @coufon this should unblock your pr: #29764 I validated both containervm image and coreos image, and works as expected. This is also required for adding gci image to node e2e test infrastructure.

Merge pull request #29890 from dchen1107/test1
c8ea7af9 · Kubernetes Submit Queue · GitHub · 74477a83 · 5a64977d · c8ea7af9
Commit c8ea7af9 authored Aug 04, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 04, 2016
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",