github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23996 from andyzheng0831/fix

Browse Source 
Trusty: Do not create the docker-daemon cgroup
This commit is contained in:
Jeff Lowdermilk 2016-04-08 12:45:16 -07:00
commit d8f42f848d
2 changed files with 0 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/gce/trusty/master.yaml
View File

@ -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

1
cluster/gce/trusty/node.yaml
View File

@ -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