From 94545889fc506d600c2ca78053ed105ab934abdc Mon Sep 17 00:00:00 2001
From: Zach Loafman <zml@google.com>
Date: Fri, 19 Dec 2014 05:49:19 -0800
Subject: [PATCH] Allow parameterization by environment in
 cluster/gce/config-test.sh

Between this and careful use of "export HOME=/somewhere_else_for_auth/",
you can effectively get ghetto CLI profiles (for GCE tests).
---
 cluster/gce/config-default.sh | 8 ++++----
 cluster/gce/config-test.sh    | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
index 8a028604477..36638be9605 100755
--- a/cluster/gce/config-default.sh
+++ b/cluster/gce/config-default.sh
@@ -17,17 +17,17 @@
 # TODO(jbeda): Provide a way to override project
 # gcloud multiplexing for shared GCE/GKE tests.
 GCLOUD=gcloud
-ZONE=us-central1-b
+ZONE=${KUBE_GCE_ZONE:-us-central1-b}
 MASTER_SIZE=n1-standard-1
 MINION_SIZE=n1-standard-1
-NUM_MINIONS=4
+NUM_MINIONS=${NUM_MINIONS:-4}
 # TODO(dchen1107): Filed an internal issue to create an alias
 # for containervm image, so that gcloud will expand this
 # to the latest supported image.
 IMAGE=container-vm-v20141208
 IMAGE_PROJECT=google-containers
-NETWORK=default
-INSTANCE_PREFIX=kubernetes
+NETWORK=${KUBE_GCE_NETWORK:-default}
+INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-kubernetes}"
 MASTER_NAME="${INSTANCE_PREFIX}-master"
 MASTER_TAG="${INSTANCE_PREFIX}-master"
 MINION_TAG="${INSTANCE_PREFIX}-minion"
diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
index 7074312da13..5ad43de0a44 100755
--- a/cluster/gce/config-test.sh
+++ b/cluster/gce/config-test.sh
@@ -17,17 +17,17 @@
 # TODO(jbeda): Provide a way to override project
 # gcloud multiplexing for shared GCE/GKE tests.
 GCLOUD=gcloud
-ZONE=us-central1-b
+ZONE=${KUBE_GCE_ZONE:-us-central1-b}
 MASTER_SIZE=g1-small
 MINION_SIZE=g1-small
-NUM_MINIONS=2
+NUM_MINIONS=${NUM_MINIONS:-2}
 # TODO(dchen1107): Filed an internal issue to create an alias
 # for containervm image, so that gcloud will expand this
 # to the latest supported image.
 IMAGE=container-vm-v20141208
 IMAGE_PROJECT=google-containers
-NETWORK=e2e
-INSTANCE_PREFIX="e2e-test-${USER}"
+NETWORK=${KUBE_GCE_NETWORK:-e2e}
+INSTANCE_PREFIX="${KUBE_GCE_INSTANCE_PREFIX:-e2e-test-${USER}}"
 MASTER_NAME="${INSTANCE_PREFIX}-master"
 MASTER_TAG="${INSTANCE_PREFIX}-master"
 MINION_TAG="${INSTANCE_PREFIX}-minion"