diff --git a/cluster/aws/config-default.sh b/cluster/aws/config-default.sh index 4ff88d63937..276fb481c4b 100644 --- a/cluster/aws/config-default.sh +++ b/cluster/aws/config-default.sh @@ -65,6 +65,7 @@ EXTRA_DOCKER_OPTS="${EXTRA_DOCKER_OPTS:-}" INSTANCE_PREFIX="${KUBE_AWS_INSTANCE_PREFIX:-kubernetes}" CLUSTER_ID=${INSTANCE_PREFIX} +VPC_NAME=${VPC_NAME:-kubernetes-vpc} AWS_SSH_KEY=${AWS_SSH_KEY:-$HOME/.ssh/kube_aws_rsa} CONFIG_CONTEXT="${KUBE_CONFIG_CONTEXT:-aws_${INSTANCE_PREFIX}}" IAM_PROFILE_MASTER="kubernetes-master" diff --git a/cluster/aws/util.sh b/cluster/aws/util.sh index 747121bd9bb..be657aa9d2e 100755 --- a/cluster/aws/util.sh +++ b/cluster/aws/util.sh @@ -136,7 +136,7 @@ fi # TODO (bburns) Parameterize this for multiple cluster per project function get_vpc_id { $AWS_CMD describe-vpcs \ - --filters Name=tag:Name,Values=kubernetes-vpc \ + --filters Name=tag:Name,Values=${VPC_NAME} \ Name=tag:KubernetesCluster,Values=${CLUSTER_ID} \ --query Vpcs[].VpcId } @@ -819,7 +819,7 @@ function vpc-setup { VPC_ID=$($AWS_CMD create-vpc --cidr-block ${VPC_CIDR} --query Vpc.VpcId) $AWS_CMD modify-vpc-attribute --vpc-id $VPC_ID --enable-dns-support '{"Value": true}' > $LOG $AWS_CMD modify-vpc-attribute --vpc-id $VPC_ID --enable-dns-hostnames '{"Value": true}' > $LOG - add-tag $VPC_ID Name kubernetes-vpc + add-tag $VPC_ID Name ${VPC_NAME} add-tag $VPC_ID KubernetesCluster ${CLUSTER_ID} fi