github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #23491 from onorua/master

Browse Source 
set KillMode for kubelet to process, fix for #13511
This commit is contained in:
Jeff Lowdermilk 2016-04-08 16:39:32 -07:00
commit e17213a2a8
6 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cluster/aws/coreos/node.yaml
View File

@ -76,6 +76,7 @@ coreos:
--container-runtime=${KUBERNETES_CONTAINER_RUNTIME} --container-runtime=${KUBERNETES_CONTAINER_RUNTIME}
Restart=always Restart=always
RestartSec=10 RestartSec=10
KillMode=process
- name: kube-proxy.service - name: kube-proxy.service
command: start command: start

1
cluster/centos/node/scripts/kubelet.sh
View File

@ -65,6 +65,7 @@ Requires=docker.service
EnvironmentFile=-/opt/kubernetes/cfg/kubelet EnvironmentFile=-/opt/kubernetes/cfg/kubelet
ExecStart=/opt/kubernetes/bin/kubelet ${KUBE_PROXY_OPTS} ExecStart=/opt/kubernetes/bin/kubelet ${KUBE_PROXY_OPTS}
Restart=on-failure Restart=on-failure
KillMode=process
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target

1
cluster/gce/coreos/master.yaml
View File

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

1
cluster/gce/coreos/node.yaml
View File

@ -112,6 +112,7 @@ coreos:
--configure-cbr0=${KUBERNETES_CONFIGURE_CBR0} --configure-cbr0=${KUBERNETES_CONFIGURE_CBR0}
Restart=always Restart=always
RestartSec=10 RestartSec=10
KillMode=process
- name: kube-proxy.service - name: kube-proxy.service
command: start command: start

1
cluster/rackspace/cloud-config/node-cloud-config.yaml
View File

@ -159,6 +159,7 @@ coreos:
--v=2 --v=2
Restart=always Restart=always
RestartSec=5 RestartSec=5
KillMode=process
- name: kube-proxy.service - name: kube-proxy.service
command: start command: start
content: | content: |

1
cluster/saltbase/salt/kubelet/kubelet.service
View File

@ -6,6 +6,7 @@ Documentation=https://github.com/kubernetes/kubernetes
EnvironmentFile=/etc/sysconfig/kubelet EnvironmentFile=/etc/sysconfig/kubelet
ExecStart=/usr/local/bin/kubelet "$DAEMON_ARGS" ExecStart=/usr/local/bin/kubelet "$DAEMON_ARGS"
Restart=always Restart=always
KillMode=process
[Install] [Install]
WantedBy=multi-user.target WantedBy=multi-user.target