Skip to content

K
k3s
Commit 73e21e73 authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Drop broken SupportNoneCgroupDriver support

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 8005885b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 6 deletions
pkg/daemons/agent/agent_linux.go
View file @ 73e21e73
...@@ -26,12 +26,7 @@ func createRootlessConfig(argsMap map[string]string, hasCFS, hasPIDs bool) { ...@@ -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"] = ""
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment