From 0bfc4964960fc3e12e7fa3885c9d46cc325b8d34 Mon Sep 17 00:00:00 2001
From: Yaroslav Molocko <onorua@gmail.com>
Date: Fri, 25 Mar 2016 22:29:09 +0800
Subject: [PATCH] fix for https://github.com/kubernetes/kubernetes/issues/13511

---
 cluster/aws/coreos/node.yaml                          | 1 +
 cluster/centos/node/scripts/kubelet.sh                | 1 +
 cluster/gce/coreos/master.yaml                        | 1 +
 cluster/gce/coreos/node.yaml                          | 1 +
 cluster/rackspace/cloud-config/node-cloud-config.yaml | 1 +
 cluster/saltbase/salt/kubelet/kubelet.service         | 3 ++-
 6 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/cluster/aws/coreos/node.yaml b/cluster/aws/coreos/node.yaml
index 09cdfd9c8a0f..aa70ffdf672b 100644
--- a/cluster/aws/coreos/node.yaml
+++ b/cluster/aws/coreos/node.yaml
@@ -76,6 +76,7 @@ coreos:
         --container-runtime=${KUBERNETES_CONTAINER_RUNTIME}
         Restart=always
         RestartSec=10
+        KillMode=process
 
     - name: kube-proxy.service
       command: start
diff --git a/cluster/centos/node/scripts/kubelet.sh b/cluster/centos/node/scripts/kubelet.sh
index 21bfde0f6e6b..ed344e1fc398 100755
--- a/cluster/centos/node/scripts/kubelet.sh
+++ b/cluster/centos/node/scripts/kubelet.sh
@@ -65,6 +65,7 @@ Requires=docker.service
 EnvironmentFile=-/opt/kubernetes/cfg/kubelet
 ExecStart=/opt/kubernetes/bin/kubelet ${KUBE_PROXY_OPTS}
 Restart=on-failure
+KillMode=process
 
 [Install]
 WantedBy=multi-user.target
diff --git a/cluster/gce/coreos/master.yaml b/cluster/gce/coreos/master.yaml
index a44f4bb598fc..559c2a0974da 100644
--- a/cluster/gce/coreos/master.yaml
+++ b/cluster/gce/coreos/master.yaml
@@ -135,6 +135,7 @@ coreos:
         --reconcile-cidr=false
         Restart=always
         RestartSec=10
+        KillMode=process
         
     - name: docker.service
       drop-ins:
diff --git a/cluster/gce/coreos/node.yaml b/cluster/gce/coreos/node.yaml
index 882f1eb7d923..eebe2a166ae4 100644
--- a/cluster/gce/coreos/node.yaml
+++ b/cluster/gce/coreos/node.yaml
@@ -112,6 +112,7 @@ coreos:
         --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0}
         Restart=always
         RestartSec=10
+        KillMode=process
 
     - name: kube-proxy.service
       command: start
diff --git a/cluster/rackspace/cloud-config/node-cloud-config.yaml b/cluster/rackspace/cloud-config/node-cloud-config.yaml
index cd4eb8911d29..571302f123bb 100755
--- a/cluster/rackspace/cloud-config/node-cloud-config.yaml
+++ b/cluster/rackspace/cloud-config/node-cloud-config.yaml
@@ -159,6 +159,7 @@ coreos:
         --v=2
         Restart=always
         RestartSec=5
+        KillMode=process
     - name: kube-proxy.service
       command: start
       content: |
diff --git a/cluster/saltbase/salt/kubelet/kubelet.service b/cluster/saltbase/salt/kubelet/kubelet.service
index b266e03fb583..86f4913af6ca 100644
--- a/cluster/saltbase/salt/kubelet/kubelet.service
+++ b/cluster/saltbase/salt/kubelet/kubelet.service
@@ -6,6 +6,7 @@ Documentation=https://github.com/kubernetes/kubernetes
 EnvironmentFile=/etc/sysconfig/kubelet
 ExecStart=/usr/local/bin/kubelet "$DAEMON_ARGS"
 Restart=always
+KillMode=process
 
 [Install]
-WantedBy=multi-user.target
\ No newline at end of file
+WantedBy=multi-user.target