Merge pull request #23491 from onorua/master

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

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

cluster/gce/coreos/master.yaml

@@ -135,6 +135,7 @@ coreos:
         --reconcile-cidr=false
         Restart=always
         RestartSec=10
+        KillMode=process
         
     - name: docker.service
       drop-ins:

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

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

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