github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Remove unnecessary loop.

Browse Source
This commit is contained in:
Robert Bailey 2015-01-13 16:03:30 -08:00
parent f589ee98e0
commit df03cc3e0c
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
cluster/validate-cluster.sh
View File

@ -33,6 +33,7 @@ detect-master > /dev/null
detect-minions > /dev/null detect-minions > /dev/null
MINIONS_FILE=/tmp/minions MINIONS_FILE=/tmp/minions
# Make several attempts to deal with slow cluster birth.
attempt=0 attempt=0
while true; do while true; do
"${KUBE_ROOT}/cluster/kubectl.sh" get minions -o template -t $'{{range.items}}{{.id}}\n{{end}}' > "${MINIONS_FILE}" "${KUBE_ROOT}/cluster/kubectl.sh" get minions -o template -t $'{{range.items}}{{.id}}\n{{end}}' > "${MINIONS_FILE}"
@ -57,24 +58,14 @@ fi
for (( i=0; i<${#MINION_NAMES[@]}; i++)); do for (( i=0; i<${#MINION_NAMES[@]}; i++)); do
# Grep returns an exit status of 1 when line is not found, so we need the : to always return a 0 exit status # Grep returns an exit status of 1 when line is not found, so we need the : to always return a 0 exit status
# Make several attempts to deal with slow cluster birth. count=$(grep -c "${MINION_NAMES[$i]}" "${MINIONS_FILE}") || :
attempt=0 if [[ "${count}" == "0" ]]; then
while true; do echo -e "${color_red}Failed to find ${MINION_NAMES[$i]}, cluster is probably broken.${color_norm}"
echo -n "Attempt $((attempt+1)) to find ${MINION_NAMES[$i]} ..." exit 1
count=$(grep -c "${MINION_NAMES[$i]}" "${MINIONS_FILE}") || : else
if [[ "${count}" == "0" ]]; then echo -e " ${color_green}[working]${color_norm}"
if (( attempt > 5 )); then break
echo -e "${color_red}Failed to find ${MINION_NAMES[$i]}, cluster is probably broken.${color_norm}" fi
exit 1
fi
else
echo -e " ${color_green}[working]${color_norm}"
break
fi
echo -e " ${color_yellow}[not working yet]${color_norm}"
attempt=$((attempt+1))
sleep 20
done
name="${MINION_NAMES[$i]}" name="${MINION_NAMES[$i]}"
if [ "$KUBERNETES_PROVIDER" != "vsphere" ] && [ "$KUBERNETES_PROVIDER" != "vagrant" ]; then if [ "$KUBERNETES_PROVIDER" != "vsphere" ] && [ "$KUBERNETES_PROVIDER" != "vagrant" ]; then