From 2118c31bdbb71ea2ce25fc7de388043fd0017fde Mon Sep 17 00:00:00 2001 From: Remco Date: Wed, 26 Nov 2014 12:17:14 +0100 Subject: [PATCH] enhancement(aws): checks for existing kubernetes vpc first without this check, kube-up creates a new vpc every time. Now it will reuse the vpc tagged Kubernetes. --- cluster/aws/util.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 80cc31009a..32c10326a0 100644 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -229,7 +229,10 @@ function kube-up { fi $AWS_CMD import-key-pair --key-name kubernetes --public-key-material file://$AWS_SSH_KEY.pub > /dev/null 2>&1 || true - VPC_ID=$($AWS_CMD create-vpc --cidr-block 172.20.0.0/16 | json_val '["Vpc"]["VpcId"]') + VPC_ID=$($AWS_CMD describe-vpcs | get_vpc_id) + if [ ! -f VPC_ID ]; then + VPC_ID=$($AWS_CMD create-vpc --cidr-block 172.20.0.0/16 | json_val '["Vpc"]["VpcId"]') + fi $AWS_CMD modify-vpc-attribute --vpc-id $VPC_ID --enable-dns-support '{"Value": true}' > /dev/null $AWS_CMD modify-vpc-attribute --vpc-id $VPC_ID --enable-dns-hostnames '{"Value": true}' > /dev/null $AWS_CMD create-tags --resources $VPC_ID --tags Key=Name,Value=kubernetes-vpc > /dev/null