AWS: Allow callers to specify VPC_ID and SUBNET_ID

This is for people that want to run in a shared VPC/Subnet; while this should work, we don't actively want to support it yet. So we don't block it, but we don't document/encourage it either!

AWS: Allow callers to specify VPC_ID and SUBNET_ID
2429c7ed · Justin Santa Barbara · bb6f2f7a · 2429c7ed
Commit 2429c7ed authored Jul 06, 2015 by Justin Santa Barbara
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 3 deletions

util.sh cluster/aws/util.sh +6 -3

No files found.
--- a/cluster/aws/util.sh
+++ b/cluster/aws/util.sh
@@ -678,8 +678,9 @@ function kube-up {

  import-public-key ${AWS_SSH_KEY_NAME} ${AWS_SSH_KEY}.pub

-  VPC_ID=$(get_vpc_id)
-
+  if [[ -z "${VPC_ID:-}" ]]; then
+    VPC_ID=$(get_vpc_id)
+  fi
  if [[ -z "$VPC_ID" ]]; then
 	  echo "Creating vpc."
 	  VPC_ID=$($AWS_CMD create-vpc --cidr-block $INTERNAL_IP_BASE.0/16 | json_val '["Vpc"]["VpcId"]')
@@ -691,7 +692,9 @@ function kube-up {

  echo "Using VPC $VPC_ID"

-  SUBNET_ID=$($AWS_CMD describe-subnets --filters Name=tag:KubernetesCluster,Values=${CLUSTER_ID} | get_subnet_id $VPC_ID $ZONE)
+  if [[ -z "${SUBNET_ID:-}" ]]; then
+    SUBNET_ID=$($AWS_CMD describe-subnets --filters Name=tag:KubernetesCluster,Values=${CLUSTER_ID} | get_subnet_id $VPC_ID $ZONE)
+  fi
  if [[ -z "$SUBNET_ID" ]]; then
    echo "Creating subnet."
    SUBNET_ID=$($AWS_CMD create-subnet --cidr-block $INTERNAL_IP_BASE.0/24 --vpc-id $VPC_ID --availability-zone ${ZONE} | json_val '["Subnet"]["SubnetId"]')