From 6f1d60ed3117064a8c2fe6924dcb1fca7e3be258 Mon Sep 17 00:00:00 2001 From: Zach Loafman Date: Tue, 2 Jun 2015 07:01:23 -0700 Subject: [PATCH] gke provider: Fix "gcloud .* describe" checks in util.sh This basically prevents you from re-running e2es cross-project on the GKE provider. (The current Jenkins jobs that have been moved to different projects are working kind of accidentally.) --- cluster/gke/util.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cluster/gke/util.sh b/cluster/gke/util.sh index b79e949ee3c..be01f35dda9 100755 --- a/cluster/gke/util.sh +++ b/cluster/gke/util.sh @@ -116,7 +116,7 @@ function kube-up() { detect-project >&2 # Make the specified network if we need to. - if ! gcloud compute networks describe "${NETWORK}" &>/dev/null; then + if ! gcloud compute networks --project "${PROJECT}" describe "${NETWORK}" &>/dev/null; then echo "Creating new network: ${NETWORK}" >&2 gcloud compute networks create "${NETWORK}" --project="${PROJECT}" --range "${NETWORK_RANGE}" else @@ -125,7 +125,7 @@ function kube-up() { # Allow SSH on all nodes in the network. This doesn't actually check whether # such a rule exists, only whether we've created this exact rule. - if ! gcloud compute firewall-rules describe "${FIREWALL_SSH}" &>/dev/null; then + if ! gcloud compute firewall-rules --project "${PROJECT}" describe "${FIREWALL_SSH}" &>/dev/null; then echo "Creating new firewall for SSH: ${FIREWALL_SSH}" >&2 gcloud compute firewall-rules create "${FIREWALL_SSH}" \ --allow="tcp:22" \