From b1e18f3ca01744506a30d5c48b8e7987944beb40 Mon Sep 17 00:00:00 2001 From: Andy Zheng Date: Thu, 7 Apr 2016 13:43:26 -0700 Subject: [PATCH] Trusty: Do not create the docker-daemon cgroup --- cluster/gce/trusty/master.yaml | 1 - cluster/gce/trusty/node.yaml | 1 - 2 files changed, 2 deletions(-) diff --git a/cluster/gce/trusty/master.yaml b/cluster/gce/trusty/master.yaml index 07ad66ff07f..6f7a62adc25 100644 --- a/cluster/gce/trusty/master.yaml +++ b/cluster/gce/trusty/master.yaml @@ -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 diff --git a/cluster/gce/trusty/node.yaml b/cluster/gce/trusty/node.yaml index 65d36274b5f..75f0dd71f15 100644 --- a/cluster/gce/trusty/node.yaml +++ b/cluster/gce/trusty/node.yaml @@ -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