mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-07-24 20:24:09 +00:00
Merge pull request #23996 from andyzheng0831/fix
Trusty: Do not create the docker-daemon cgroup
This commit is contained in:
commit
d8f42f848d
@ -138,7 +138,6 @@ script
|
||||
--configure-cbr0=${ALLOCATE_NODE_CIDRS} \
|
||||
--cgroup-root=/ \
|
||||
--system-cgroups=/system \
|
||||
--runtime-cgroups=/docker-daemon \
|
||||
--kubelet-cgroups=/kubelet \
|
||||
--babysit-daemons=true \
|
||||
${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1
|
||||
|
@ -137,7 +137,6 @@ script
|
||||
--configure-cbr0=true \
|
||||
--cgroup-root=/ \
|
||||
--system-cgroups=/system \
|
||||
--runtime-cgroups=/docker-daemon \
|
||||
--kubelet-cgroups=/kubelet \
|
||||
--babysit-daemons=true \
|
||||
${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1
|
||||
|
Loading…
Reference in New Issue
Block a user