Merge pull request kubernetes#6410 from fgrzadkowski/size_from_envvar

Add ability to set master/minion size for GCE using envvar.
duda · Apr 3, 2015 · d8a78b5 · d8a78b5
2 parents cec84f5 + 0ffabfa
commit d8a78b5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cluster/gce/config-default.sh b/cluster/gce/config-default.sh
@@ -18,8 +18,8 @@
 # gcloud multiplexing for shared GCE/GKE tests.
 GCLOUD=gcloud
 ZONE=${KUBE_GCE_ZONE:-us-central1-b}
-MASTER_SIZE=n1-standard-1
-MINION_SIZE=n1-standard-1
+MASTER_SIZE=${MASTER_SIZE:-n1-standard-1}
+MINION_SIZE=${MINION_SIZE:-n1-standard-1}
 NUM_MINIONS=${NUM_MINIONS:-4}
 MINION_DISK_TYPE=pd-standard
 MINION_DISK_SIZE=100GB

diff --git a/cluster/gce/config-test.sh b/cluster/gce/config-test.sh
@@ -18,8 +18,8 @@
 # gcloud multiplexing for shared GCE/GKE tests.
 GCLOUD=gcloud
 ZONE=${KUBE_GCE_ZONE:-us-central1-b}
-MASTER_SIZE=g1-small
-MINION_SIZE=g1-small
+MASTER_SIZE=${MASTER_SIZE:-g1-small}
+MINION_SIZE=${MINION_SIZE:-g1-small}
 NUM_MINIONS=${NUM_MINIONS:-2}
 MINION_DISK_TYPE=pd-standard
 MINION_DISK_SIZE=100GB