Merge pull request #30415 from dchen1107/test1
Automatic merge from submit-queue Fixed misconfigured kubelet on containervm image for node-e2e. Fixed #30412 to unblock @coufon's performance benchmark work. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.kubernetes.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.kubernetes.io/reviews/kubernetes/kubernetes/30415) <!-- Reviewable:end -->
This commit is contained in:
@@ -253,6 +253,8 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) {
|
||||
cmdArgs = append(cmdArgs,
|
||||
"--runtime-cgroups=/docker-daemon",
|
||||
"--kubelet-cgroups=/kubelet",
|
||||
"--cgroup-root=/",
|
||||
"--system-cgroups=/system",
|
||||
)
|
||||
}
|
||||
cmdArgs = append(cmdArgs,
|
||||
@@ -273,7 +275,6 @@ func (es *e2eService) startKubeletServer() (*killCmd, error) {
|
||||
if es.cgroupsPerQOS {
|
||||
cmdArgs = append(cmdArgs,
|
||||
"--cgroups-per-qos", "true",
|
||||
"--cgroup-root", "/",
|
||||
)
|
||||
}
|
||||
if !*disableKubenet {
|
||||
|
||||
Reference in New Issue
Block a user