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

Merge pull request #12646 from Huawei-PaaS/ubuntu_verify_cluster_timeout

Browse Source 
remove duplicated cluster verify logic in ubuntu deployments scripts.
This commit is contained in:
Brian Grant 2015-09-24 16:44:45 -07:00
commit e7fa5d4df8
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
cluster/ubuntu/util.sh
View File

@ -140,6 +140,8 @@ function verify-master(){
printf "Validating master" printf "Validating master"
local -a required_daemon=("kube-apiserver" "kube-controller-manager" "kube-scheduler") local -a required_daemon=("kube-apiserver" "kube-controller-manager" "kube-scheduler")
local validated="1" local validated="1"
local try_count=1
local max_try_count=30
until [[ "$validated" == "0" ]]; do until [[ "$validated" == "0" ]]; do
validated="0" validated="0"
local daemon local daemon
@ -147,6 +149,11 @@ function verify-master(){
ssh $SSH_OPTS "$MASTER" "pgrep -f ${daemon}" >/dev/null 2>&1 || { ssh $SSH_OPTS "$MASTER" "pgrep -f ${daemon}" >/dev/null 2>&1 || {
printf "." printf "."
validated="1" validated="1"
((try_count=try_count+1))
if [[ ${try_count} -gt ${max_try_count} ]]; then
printf "\nWarning: Process \"${daemon}\" failed to run on ${MASTER}, please check.\n"
exit 1
fi
sleep 2 sleep 2
} }
done done
@ -160,6 +167,8 @@ function verify-node(){
printf "Validating ${1}" printf "Validating ${1}"
local -a required_daemon=("kube-proxy" "kubelet" "docker") local -a required_daemon=("kube-proxy" "kubelet" "docker")
local validated="1" local validated="1"
local try_count=1
local max_try_count=30
until [[ "$validated" == "0" ]]; do until [[ "$validated" == "0" ]]; do
validated="0" validated="0"
local daemon local daemon
@ -167,6 +176,11 @@ function verify-node(){
ssh $SSH_OPTS "$1" "pgrep -f $daemon" >/dev/null 2>&1 || { ssh $SSH_OPTS "$1" "pgrep -f $daemon" >/dev/null 2>&1 || {
printf "." printf "."
validated="1" validated="1"
((try_count=try_count+1))
if [[ ${try_count} -gt ${max_try_count} ]]; then
printf "\nWarning: Process \"${daemon}\" failed to run on ${1}, please check.\n"
exit 1
fi
sleep 2 sleep 2
} }
done done