github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 14:07:14 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2651 from justinsb/specify_zone_to_ec2

Browse Source 
Specify AWS_DEFAULT_REGION to match configured region
This commit is contained in:
Brendan Burns 2014-12-19 12:26:40 -08:00
commit 824122f410
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/aws/util.sh
View File

@ -20,6 +20,7 @@
# config-default.sh. # config-default.sh.
source $(dirname ${BASH_SOURCE})/${KUBE_CONFIG_FILE-"config-default.sh"} source $(dirname ${BASH_SOURCE})/${KUBE_CONFIG_FILE-"config-default.sh"}
export AWS_DEFAULT_REGION=${ZONE}
AWS_CMD="aws --output json ec2" AWS_CMD="aws --output json ec2"
function json_val { function json_val {
@ -421,7 +422,6 @@ EOF
} }
function kube-down { function kube-down {
AWS_CMD="aws --output json ec2"
instance_ids=$($AWS_CMD describe-instances | get_instance_ids) instance_ids=$($AWS_CMD describe-instances | get_instance_ids)
$AWS_CMD terminate-instances --instance-ids $instance_ids > /dev/null $AWS_CMD terminate-instances --instance-ids $instance_ids > /dev/null
echo "Waiting for instances deleted" echo "Waiting for instances deleted"