From 5d794d8280db13047cd9685ed9a5eb4a62623143 Mon Sep 17 00:00:00 2001 From: Kelsey Hightower Date: Sun, 11 Sep 2016 01:05:13 -0700 Subject: [PATCH] add support for aws --- docs/01-infrastructure-aws.md | 13 ++++++++++--- docs/02-certificate-authority.md | 8 ++++---- docs/04-kubernetes-controller.md | 8 -------- 3 files changed, 14 insertions(+), 15 deletions(-) diff --git a/docs/01-infrastructure-aws.md b/docs/01-infrastructure-aws.md index f13d308..10811c1 100644 --- a/docs/01-infrastructure-aws.md +++ b/docs/01-infrastructure-aws.md @@ -131,9 +131,16 @@ aws ec2 authorize-security-group-ingress \ Create a public IP address that will be used by remote clients to connect to the Kubernetes control plane: ``` -KUBERNETES_PUBLIC_IP=$(aws ec2 allocate-address \ - --domain vpc | \ - jq -r '.PublicIp') +aws elb create-load-balancer \ + --load-balancer-name kubernetes \ + --listeners "Protocol=TCP,LoadBalancerPort=6443,InstanceProtocol=TCP,InstancePort=6443" \ + --subnets ${SUBNET_ID} \ + --security-groups ${SECURITY_GROUP_ID} +``` +``` +KUBERNETES_PUBLIC_IP_ADDRESS=$(aws elb describe-load-balancers \ + --load-balancer-name kubernetes | \ + jq -r '.LoadBalancerDescriptions[].DNSName') ``` ## Provision Virtual Machines diff --git a/docs/02-certificate-authority.md b/docs/02-certificate-authority.md index 51f0427..1d3d785 100644 --- a/docs/02-certificate-authority.md +++ b/docs/02-certificate-authority.md @@ -125,16 +125,16 @@ In this section we will generate a TLS certificate that will be valid for all Ku #### GCE ``` -export KUBERNETES_PUBLIC_IP_ADDRESS=$(gcloud compute addresses describe kubernetes \ +KUBERNETES_PUBLIC_IP_ADDRESS=$(gcloud compute addresses describe kubernetes \ --format 'value(address)') ``` #### AWS ``` -export KUBERNETES_PUBLIC_IP_ADDRESS=$(aws ec2 allocate-address \ - --domain vpc | \ - jq -r '.PublicIp') +KUBERNETES_PUBLIC_IP_ADDRESS=$(aws elb describe-load-balancers \ + --load-balancer-name kubernetes | \ + jq -r '.LoadBalancerDescriptions[].DNSName') ``` --- diff --git a/docs/04-kubernetes-controller.md b/docs/04-kubernetes-controller.md index 704ddc9..c5a7b4c 100644 --- a/docs/04-kubernetes-controller.md +++ b/docs/04-kubernetes-controller.md @@ -305,14 +305,6 @@ gcloud compute forwarding-rules create kubernetes-rule \ ### AWS -``` -aws elb create-load-balancer \ - --load-balancer-name kubernetes \ - --listeners "Protocol=TCP,LoadBalancerPort=6443,InstanceProtocol=TCP,InstancePort=6443" \ - --subnets ${SUBNET_ID} \ - --security-groups ${SECURITY_GROUP_ID} -``` - ``` aws elb register-instances-with-load-balancer \ --load-balancer-name kubernetes \