github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

Fixed misconfigured kubelet on containervm image for node-e2e.

Browse Source
This commit is contained in:
Dawn Chen 2016-08-10 17:47:11 -07:00
parent 019b4c0e8f
commit cb22c41907
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
test/e2e_node/e2e_service.go
View File

@ -252,6 +252,8 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) {
cmdArgs = append(cmdArgs, cmdArgs = append(cmdArgs,
"--runtime-cgroups=/docker-daemon", "--runtime-cgroups=/docker-daemon",
"--kubelet-cgroups=/kubelet", "--kubelet-cgroups=/kubelet",
"--cgroup-root=/",
"--system-cgroups=/system",
) )
} }
cmdArgs = append(cmdArgs, cmdArgs = append(cmdArgs,
@ -272,7 +274,6 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) {
if es.cgroupsPerQOS { if es.cgroupsPerQOS {
cmdArgs = append(cmdArgs, cmdArgs = append(cmdArgs,
"--cgroups-per-qos", "true", "--cgroups-per-qos", "true",
"--cgroup-root", "/",
) )
} }
if !*disableKubenet { if !*disableKubenet {