github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-28 04:53:11 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #47773 from caesarxuchao/fix-upgrade

Browse Source 
Automatic merge from submit-queue

fix validate-cluster.sh

attempt to fix #47379.

Without this fix, the validate-cluster.sh never retries if `kubectl-retry get cs` fails.

cc @dchen1107
This commit is contained in:
Kubernetes Submit Queue 2017-06-20 20:02:09 -07:00 committed by GitHub
commit 5ca33f51ac
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/validate-cluster.sh
View File

@ -153,7 +153,7 @@ while true; do
componentstatuses=$(echo "${cs_status}" | grep -c 'Healthy:') || true
healthy=$(echo "${cs_status}" | grep -c 'Healthy:True') || true
if ((componentstatuses > healthy)); then
if ((componentstatuses > healthy)) || ((componentstatuses == 0)); then
if ((attempt < 5)); then
echo -e "${color_yellow}Cluster not working yet.${color_norm}"
attempt=$((attempt+1))
@ -170,7 +170,7 @@ while true; do
done
echo "Validate output:"
kubectl_retry get cs
kubectl_retry get cs || true
if [ "${return_value}" == "0" ]; then
echo -e "${color_green}Cluster validation succeeded${color_norm}"
else