github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8040 from nak3/terminate-child-process-local-up-cluster

Browse Source 
Terminate child process by cleanup() in local-up-cluster.sh
This commit is contained in:
Nikhil Jindal 2015-05-11 10:11:28 -07:00
commit 3d8f94ed59
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
hack/local-up-cluster.sh
View File

@ -109,17 +109,17 @@ cleanup_dockerized_kubelet()
cleanup() cleanup()
{ {
echo "Cleaning up..." echo "Cleaning up..."
[[ -n "${APISERVER_PID-}" ]] && sudo kill "${APISERVER_PID}" [[ -n "${APISERVER_PID-}" ]] && sudo kill $(ps --ppid=${APISERVER_PID} --pid=${APISERVER_PID} | cut -d' ' -f1)
[[ -n "${CTLRMGR_PID-}" ]] && sudo kill "${CTLRMGR_PID}" [[ -n "${CTLRMGR_PID-}" ]] && sudo kill $(ps --ppid=${CTLRMGR_PID} --pid=${CTLRMGR_PID} | cut -d' ' -f1)
if [[ -n "$DOCKERIZE_KUBELET" ]]; then if [[ -n "$DOCKERIZE_KUBELET" ]]; then
cleanup_dockerized_kubelet cleanup_dockerized_kubelet
else else
[[ -n "${KUBELET_PID-}" ]] && sudo kill "${KUBELET_PID}" [[ -n "${KUBELET_PID-}" ]] && sudo kill $(ps --ppid=${KUBELET_PID} --pid=${KUBELET_PID} | cut -d' ' -f1)
fi fi
[[ -n "${PROXY_PID-}" ]] && sudo kill "${PROXY_PID}" [[ -n "${PROXY_PID-}" ]] && sudo kill $(ps --ppid=${PROXY_PID} --pid=${PROXY_PID} | cut -d' ' -f1)
[[ -n "${SCHEDULER_PID-}" ]] && sudo kill "${SCHEDULER_PID}" [[ -n "${SCHEDULER_PID-}" ]] && sudo kill $(ps --ppid=${SCHEDULER_PID} --pid=${SCHEDULER_PID} | cut -d' ' -f1)
[[ -n "${ETCD_PID-}" ]] && kube::etcd::stop [[ -n "${ETCD_PID-}" ]] && kube::etcd::stop
[[ -n "${ETCD_DIR-}" ]] && kube::etcd::clean_etcd_dir [[ -n "${ETCD_DIR-}" ]] && kube::etcd::clean_etcd_dir