From ab20a9adbee4538d32005386a269e43ed31f7de9 Mon Sep 17 00:00:00 2001
From: Andy Zheng <qzheng@google.com>
Date: Mon, 14 Mar 2016 21:09:21 -0700
Subject: [PATCH] Trusty: Fix node kubelet pod-cidr flag

---
 cluster/gce/trusty/configure.sh | 7 ++++---
 cluster/gce/trusty/master.yaml  | 1 +
 cluster/gce/trusty/node.yaml    | 1 +
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/cluster/gce/trusty/configure.sh b/cluster/gce/trusty/configure.sh
index 6e7ac68e2b..4b51fddbb3 100644
--- a/cluster/gce/trusty/configure.sh
+++ b/cluster/gce/trusty/configure.sh
@@ -254,12 +254,13 @@ assemble_kubelet_flags() {
   if [ -n "${KUBELET_TEST_ARGS:-}" ]; then
     KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} ${KUBELET_TEST_ARGS}"
   fi
-  if [ ! -z "${KUBELET_APISERVER:-}" ] && [ ! -z "${KUBELET_CERT:-}" ] && [ ! -z "${KUBELET_KEY:-}" ]; then
+  if [ "${KUBERNETES_MASTER:-}" = "true" ] && \
+     [ ! -z "${KUBELET_APISERVER:-}" ] && \
+     [ ! -z "${KUBELET_CERT:-}" ] && \
+     [ ! -z "${KUBELET_KEY:-}" ]; then
     KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --api-servers=https://${KUBELET_APISERVER}"
     KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --register-schedulable=false --reconcile-cidr=false"
     KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --pod-cidr=10.123.45.0/30"
-  else
-    KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --pod-cidr=${MASTER_IP_RANGE}"
   fi
   if [ "${ENABLE_MANIFEST_URL:-}" = "true" ]; then
     KUBELET_CMD_FLAGS="${KUBELET_CMD_FLAGS} --manifest-url=${MANIFEST_URL} --manifest-url-header=${MANIFEST_URL_HEADER}"
diff --git a/cluster/gce/trusty/master.yaml b/cluster/gce/trusty/master.yaml
index 799e12ee82..8fdfdb48a1 100644
--- a/cluster/gce/trusty/master.yaml
+++ b/cluster/gce/trusty/master.yaml
@@ -144,6 +144,7 @@ script
 		--system-cgroups=/system \
 		--runtime-cgroups=/docker-daemon \
 		--kubelet-cgroups=/kubelet \
+		--babysit-daemons=true \
 		${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1
 end script
 
diff --git a/cluster/gce/trusty/node.yaml b/cluster/gce/trusty/node.yaml
index e5e47643be..3d930a4c23 100644
--- a/cluster/gce/trusty/node.yaml
+++ b/cluster/gce/trusty/node.yaml
@@ -143,6 +143,7 @@ script
 		--system-cgroups=/system \
 		--runtime-cgroups=/docker-daemon \
 		--kubelet-cgroups=/kubelet \
+		--babysit-daemons=true \
 		${KUBELET_CMD_FLAGS} 1>>/var/log/kubelet.log 2>&1
 end script