Merge pull request #47773 from caesarxuchao/fix-upgrade

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

Merge pull request #47773 from caesarxuchao/fix-upgrade
5ca33f51 · Kubernetes Submit Queue · GitHub · 8316bbc1 · 986164e7 · 5ca33f51
Commit 5ca33f51 authored Jun 20, 2017 by Kubernetes Submit Queue Committed by GitHub Jun 20, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

validate-cluster.sh cluster/validate-cluster.sh +2 -2

No files found.
--- a/cluster/validate-cluster.sh
+++ b/cluster/validate-cluster.sh
@@ -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