Skip to content

K
k3s
Commit b1e18f3c authored by Andy Zheng's avatar Andy Zheng
Browse files
Options

Trusty: Do not create the docker-daemon cgroup

parent f690220b
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
cluster/gce/trusty/master.yaml
View file @ b1e18f3c
...@@ -138,7 +138,6 @@ script ...@@ -138,7 +138,6 @@ script
--configure-cbr0=${ALLOCATE_NODE_CIDRS} \ --configure-cbr0=${ALLOCATE_NODE_CIDRS} \
--cgroup-root=/ \ --cgroup-root=/ \
--system-cgroups=/system \ --system-cgroups=/system \
--runtime-cgroups=/docker-daemon \
--kubelet-cgroups=/kubelet \ --kubelet-cgroups=/kubelet \
--babysit-daemons=true \ --babysit-daemons=true \
${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1 ${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1
......
cluster/gce/trusty/node.yaml
View file @ b1e18f3c
...@@ -137,7 +137,6 @@ script ...@@ -137,7 +137,6 @@ script
--configure-cbr0=true \ --configure-cbr0=true \
--cgroup-root=/ \ --cgroup-root=/ \
--system-cgroups=/system \ --system-cgroups=/system \
--runtime-cgroups=/docker-daemon \
--kubelet-cgroups=/kubelet \ --kubelet-cgroups=/kubelet \
--babysit-daemons=true \ --babysit-daemons=true \
${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1 ${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1
......
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