Skip to content

K
k3s
Commit 4ad0ec36 authored by Alex Robinson's avatar Alex Robinson
Browse files
Options

Merge pull request #5378 from justinsb/aws_instance_type

Allow the AWS instance type to be specified via MASTER_SIZE, MINION_SIZE
parents 93449346 f71e0eeb
Show whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
cluster/aws/config-default.sh
View file @ 4ad0ec36
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
# TODO: the zone isn't quite piped into all the right places... # TODO: the zone isn't quite piped into all the right places...
ZONE=${KUBE_AWS_ZONE:-us-west-2} ZONE=${KUBE_AWS_ZONE:-us-west-2}
MASTER_SIZE=t2.micro MASTER_SIZE=${MASTER_SIZE:-t2.micro}
MINION_SIZE=t2.micro MINION_SIZE=${MINION_SIZE:-t2.micro}
NUM_MINIONS=${NUM_MINIONS:-4} NUM_MINIONS=${NUM_MINIONS:-4}
# This is the ubuntu 14.04 image for us-west-2 + ebs # This is the ubuntu 14.04 image for us-west-2 + ebs
......
cluster/aws/config-test.sh
View file @ 4ad0ec36
...@@ -16,8 +16,8 @@ ...@@ -16,8 +16,8 @@
# TODO: this isn't quite piped into all the right places... # TODO: this isn't quite piped into all the right places...
ZONE=${KUBE_AWS_ZONE:-us-west-2} ZONE=${KUBE_AWS_ZONE:-us-west-2}
MASTER_SIZE=t2.micro MASTER_SIZE=${MASTER_SIZE:-t2.micro}
MINION_SIZE=t2.micro MINION_SIZE=${MINION_SIZE:-t2.micro}
NUM_MINIONS=${NUM_MINIONS:-2} NUM_MINIONS=${NUM_MINIONS:-2}
# This is the ubuntu 14.04 image for us-west-2 + ebs # This is the ubuntu 14.04 image for us-west-2 + ebs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment