github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

AWS: use filters in get_igw_id & get_subnet_id 

Also remove unused get_route_table_id
pull/6/head
Justin Santa Barbara 2015-11-03 10:08:46 -05:00
parent 3f3918048a
commit 1607ac1a7a
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
cluster/aws/util.sh
View File

@ -82,15 +82,20 @@ function get_vpc_id {
} }
function get_subnet_id { function get_subnet_id {
python -c "import json,sys; lst = [str(subnet['SubnetId']) for subnet in json.load(sys.stdin)['Subnets'] if subnet['VpcId'] == '$1' and subnet['AvailabilityZone'] == '$2']; print ''.join(lst)" local vpc_id=$1
local az=$2
$AWS_CMD --output text describe-subnets \
--filters Name=tag:KubernetesCluster,Values=${CLUSTER_ID} \
Name=availabilityZone,Values=${az} \
Name=vpc-id,Values=${vpc_id} \
--query Subnets[].SubnetId
} }
function get_igw_id { function get_igw_id {
python -c "import json,sys; lst = [str(igw['InternetGatewayId']) for igw in json.load(sys.stdin)['InternetGateways'] for attachment in igw['Attachments'] if attachment['VpcId'] == '$1']; print ''.join(lst)" local vpc_id=$1
} $AWS_CMD --output text describe-internet-gateways \
--filters Name=attachment.vpc-id,Values=${vpc_id} \
function get_route_table_id { --query InternetGateways[].InternetGatewayId
python -c "import json,sys; lst = [str(route_table['RouteTableId']) for route_table in json.load(sys.stdin)['RouteTables'] if route_table['VpcId'] == '$1']; print ''.join(lst)"
} }
function get_elbs_in_vpc { function get_elbs_in_vpc {
@ -713,7 +718,7 @@ function kube-up {
create-dhcp-option-set create-dhcp-option-set
if [[ -z "${SUBNET_ID:-}" ]]; then if [[ -z "${SUBNET_ID:-}" ]]; then
SUBNET_ID=$($AWS_CMD describe-subnets --filters Name=tag:KubernetesCluster,Values=${CLUSTER_ID} | get_subnet_id $VPC_ID $ZONE) SUBNET_ID=$(get_subnet_id $VPC_ID $ZONE)
fi fi
if [[ -z "$SUBNET_ID" ]]; then if [[ -z "$SUBNET_ID" ]]; then
@ -729,7 +734,7 @@ function kube-up {
echo "Using subnet $SUBNET_ID" echo "Using subnet $SUBNET_ID"
IGW_ID=$($AWS_CMD describe-internet-gateways | get_igw_id $VPC_ID) IGW_ID=$(get_igw_id $VPC_ID)
if [[ -z "$IGW_ID" ]]; then if [[ -z "$IGW_ID" ]]; then
echo "Creating Internet Gateway." echo "Creating Internet Gateway."
IGW_ID=$($AWS_CMD create-internet-gateway | json_val '["InternetGateway"]["InternetGatewayId"]') IGW_ID=$($AWS_CMD create-internet-gateway | json_val '["InternetGateway"]["InternetGatewayId"]')