Merge pull request #48864 from jszczepkowski/ha-e2e-fix

Automatic merge from submit-queue Fixed cluster validation for multizonal clusters. Fixed cluster validation for multizonal clusters. This should fix HA master e2e tests. ```release-note ```

Merge pull request #48864 from jszczepkowski/ha-e2e-fix
ca1b408b · Kubernetes Submit Queue · GitHub · 096edd64 · 1cef818c · ca1b408b
Commit ca1b408b authored Jul 14, 2017 by Kubernetes Submit Queue Committed by GitHub Jul 14, 2017
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

validate-cluster.sh cluster/validate-cluster.sh +1 -1

No files found.
--- a/cluster/validate-cluster.sh
+++ b/cluster/validate-cluster.sh
@@ -57,7 +57,7 @@ if [[ "${KUBERNETES_PROVIDER:-}" == "gce" ]]; then
  # In multizone mode we need to add instances for all nodes in the region.
  if [[ "${MULTIZONE:-}" == "true" ]]; then
    EXPECTED_NUM_NODES=$(gcloud -q compute instances list --project="${PROJECT}" --format=[no-heading] --regexp="${NODE_INSTANCE_PREFIX}.*" \
-      --zones=$(gcloud -q compute zones list --project="${PROJECT}" --filter=region=${REGION} --format=[no-heading]\(name\) | tr "\n" "," | sed  "s/,$//") | wc -l)
+      --zones=$(gcloud -q compute zones list --project="${PROJECT}" --filter=region=${REGION} --format=csv[no-heading]\(name\) | tr "\n" "," | sed  "s/,$//") | wc -l)
    echo "Computing number of nodes, NODE_INSTANCE_PREFIX=${NODE_INSTANCE_PREFIX}, REGION=${REGION}, EXPECTED_NUM_NODES=${EXPECTED_NUM_NODES}"
  fi
 fi