mirror of
https://github.com/k3s-io/k3s.git
synced 2024-06-07 19:41:36 +00:00
Drop broken SupportNoneCgroupDriver support
Signed-off-by: Brad Davidson <brad.davidson@rancher.com>
This commit is contained in:
parent
8005885bad
commit
73e21e739f
@ -26,12 +26,7 @@ func createRootlessConfig(argsMap map[string]string, hasCFS, hasPIDs bool) {
|
|||||||
// cgroupfs v2, delegated for rootless by systemd
|
// cgroupfs v2, delegated for rootless by systemd
|
||||||
argsMap["cgroup-driver"] = "cgroupfs"
|
argsMap["cgroup-driver"] = "cgroupfs"
|
||||||
} else {
|
} else {
|
||||||
logrus.Warn("cgroup v2 controllers are not delegated for rootless. Setting cgroup driver to \"none\".")
|
logrus.Fatal("delegated cgroup v2 controllers are required for rootless.")
|
||||||
// flags are from https://github.com/rootless-containers/usernetes/blob/v20190826.0/boot/kubelet.sh
|
|
||||||
argsMap["cgroup-driver"] = "none"
|
|
||||||
argsMap["feature-gates=SupportNoneCgroupDriver"] = "true"
|
|
||||||
argsMap["cgroups-per-qos"] = "false"
|
|
||||||
argsMap["enforce-node-allocatable"] = ""
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user