mirror of https://github.com/k3s-io/k3s
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
commit
c8ea7af912
|
@ -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",
|
||||
|
|
Loading…
Reference in New Issue