Merge pull request #39079 from jszczepkowski/ha-validation-fix

Automatic merge from submit-queue (batch tested with PRs 39061, 39079) Fixed cluster validation: added -q flag to gcloud. Fixed cluster validation in multi-zone mode: added -q flag to gcloud.

Merge pull request #39079 from jszczepkowski/ha-validation-fix
ecd251b2 · Kubernetes Submit Queue · GitHub · 45d2449f · 7a9ad669 · ecd251b2
Commit ecd251b2 authored Dec 21, 2016 by Kubernetes Submit Queue Committed by GitHub Dec 21, 2016
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
@@ -56,8 +56,8 @@ if [[ "${KUBERNETES_PROVIDER:-}" == "gce" ]]; then
  echo "Validating gce cluster, MULTIZONE=${MULTIZONE:-}"
  # In multizone mode we need to add instances for all nodes in the region.
  if [[ "${MULTIZONE:-}" == "true" ]]; then
-    EXPECTED_NUM_NODES=$(gcloud compute instances list --format=[no-heading] --regexp="${NODE_INSTANCE_PREFIX}.*" \
-      --zones=$(gcloud compute zones list --filter=region=${REGION} --format=[no-heading]\(name\) | tr "\n" "," | sed  "s/,$//") | wc -l)
+    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)
    echo "Computing number of nodes, NODE_INSTANCE_PREFIX=${NODE_INSTANCE_PREFIX}, REGION=${REGION}, EXPECTED_NUM_NODES=${EXPECTED_NUM_NODES}"
  fi
 fi