Merge pull request kubernetes#5378 from justinsb/aws_instance_type

Allow the AWS instance type to be specified via MASTER_SIZE, MINION_SIZE
duda · Mar 12, 2015 · 4ad0ec3 · 4ad0ec3
2 parents 9344934 + f71e0ee
commit 4ad0ec3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh
@@ -16,8 +16,8 @@
 
 # TODO: the zone isn't quite piped into all the right places...
 ZONE=${KUBE_AWS_ZONE:-us-west-2}
-MASTER_SIZE=t2.micro
-MINION_SIZE=t2.micro
+MASTER_SIZE=${MASTER_SIZE:-t2.micro}
+MINION_SIZE=${MINION_SIZE:-t2.micro}
 NUM_MINIONS=${NUM_MINIONS:-4}
 
 # This is the ubuntu 14.04 image for us-west-2 + ebs

diff --git a/cluster/aws/config-test.sh b/cluster/aws/config-test.sh
@@ -16,8 +16,8 @@
 
 # TODO: this isn't quite piped into all the right places...
 ZONE=${KUBE_AWS_ZONE:-us-west-2}
-MASTER_SIZE=t2.micro
-MINION_SIZE=t2.micro
+MASTER_SIZE=${MASTER_SIZE:-t2.micro}
+MINION_SIZE=${MINION_SIZE:-t2.micro}
 NUM_MINIONS=${NUM_MINIONS:-2}
 
 # This is the ubuntu 14.04 image for us-west-2 + ebs