github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
pull/6/head
Kubernetes Submit Queue 2016-08-04 01:17:01 -07:00 committed by GitHub
parent 74477a83e4 5a64977d82
commit c8ea7af912
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_node/e2e_service.go
View File

@ -239,6 +239,10 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) {
} }
} else { } else {
cmdArgs = append(cmdArgs, getKubeletServerBin()) cmdArgs = append(cmdArgs, getKubeletServerBin())
cmdArgs = append(cmdArgs,
"--runtime-cgroups=/docker-daemon",
"--kubelet-cgroups=/kubelet",
)
} }
cmdArgs = append(cmdArgs, cmdArgs = append(cmdArgs,
"--api-servers", "http://127.0.0.1:8080", "--api-servers", "http://127.0.0.1:8080",