Merge pull request #6410 from fgrzadkowski/size_from_envvar

Add ability to set master/minion size for GCE using envvar.
This commit is contained in:
Wojciech Tyczynski 2015-04-03 11:49:24 +02:00
commit d8a78b5160
2 changed files with 4 additions and 4 deletions

View File

@ -18,8 +18,8 @@
# gcloud multiplexing for shared GCE/GKE tests. # gcloud multiplexing for shared GCE/GKE tests.
GCLOUD=gcloud GCLOUD=gcloud
ZONE=${KUBE_GCE_ZONE:-us-central1-b} ZONE=${KUBE_GCE_ZONE:-us-central1-b}
MASTER_SIZE=n1-standard-1 MASTER_SIZE=${MASTER_SIZE:-n1-standard-1}
MINION_SIZE=n1-standard-1 MINION_SIZE=${MINION_SIZE:-n1-standard-1}
NUM_MINIONS=${NUM_MINIONS:-4} NUM_MINIONS=${NUM_MINIONS:-4}
MINION_DISK_TYPE=pd-standard MINION_DISK_TYPE=pd-standard
MINION_DISK_SIZE=100GB MINION_DISK_SIZE=100GB

View File

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