github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-04 23:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #17913 from jtblin/jtblin/17912-pick-public-subnets

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-24 23:48:15 -08:00
parent 7f613dbf15 62a8b3d44c
commit 2a58c0062d
2 changed files with 128 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
pkg/cloudprovider/providers/aws/aws.go
View File

@@ -1851,29 +1851,38 @@ func (s *AWSCloud) createTags(resourceID string, tags map[string]string) error {
}
}
func (s *AWSCloud) listSubnetIDsinVPC(vpcId string) ([]string, error) {
func (s *AWSCloud) listPublicSubnetIDsinVPC(vpcId string) ([]string, error) {
subnetIds := []string{}
request := &ec2.DescribeSubnetsInput{}
sRequest := &ec2.DescribeSubnetsInput{}
filters := []*ec2.Filter{}
filters = append(filters, newEc2Filter("vpc-id", vpcId))
// Note, this will only return subnets tagged with the cluster identifier for this Kubernetes cluster.
// In the case where an AZ has public & private subnets per AWS best practices, the deployment should ensure
// only the public subnet (where the ELB will go) is so tagged.
filters = s.addFilters(filters)
request.Filters = filters
sRequest.Filters = filters
subnets, err := s.ec2.DescribeSubnets(request)
subnets, err := s.ec2.DescribeSubnets(sRequest)
if err != nil {
glog.Error("Error describing subnets: ", err)
return nil, err
}
rRequest := &ec2.DescribeRouteTablesInput{}
rRequest.Filters = filters
rt, err := s.ec2.DescribeRouteTables(rRequest)
if err != nil {
glog.Error("error describing route tables: ", err)
return nil, err
}
availabilityZones := sets.NewString()
for _, subnet := range subnets {
az := orEmpty(subnet.AvailabilityZone)
id := orEmpty(subnet.SubnetId)
if !isSubnetPublic(rt, id) {
glog.V(2).Infof("Ignoring private subnet %q", id)
continue
}
if availabilityZones.Has(az) {
glog.Warning("Found multiple subnets per AZ '", az, "', ignoring subnet '", id, "'")
continue
@@ -1885,6 +1894,33 @@ func (s *AWSCloud) listSubnetIDsinVPC(vpcId string) ([]string, error) {
return subnetIds, nil
}
func isSubnetPublic(rt []*ec2.RouteTable, subnetID string) bool {
for _, table := range rt {
var found bool
for _, assoc := range table.Associations {
if aws.StringValue(assoc.SubnetId) == subnetID {
found = true
break
}
}
if !found {
continue
}
for _, route := range table.Routes {
// There is no direct way in the AWS API to determine if a subnet is public or private.
// A public subnet is one which has an internet gateway route
// we look for the gatewayId and make sure it has the prefix of igw to differentiate
// from the default in-subnet route which is called "local"
// or other virtual gateway (starting with vgv)
// or vpc peering connections (starting with pcx).
if strings.HasPrefix(aws.StringValue(route.GatewayId), "igw") {
return true
}
}
}
return false
}
// EnsureLoadBalancer implements LoadBalancer.EnsureLoadBalancer
// TODO(justinsb) It is weird that these take a region. I suspect it won't work cross-region anyway.
func (s *AWSCloud) EnsureLoadBalancer(name, region string, publicIP net.IP, ports []*api.ServicePort, hosts []string, serviceName types.NamespacedName, affinity api.ServiceAffinity, annotations cloudprovider.ServiceAnnotation) (*api.LoadBalancerStatus, error) {
@@ -1925,7 +1961,7 @@ func (s *AWSCloud) EnsureLoadBalancer(name, region string, publicIP net.IP, port
}
// Construct list of configured subnets
subnetIDs, err := s.listSubnetIDsinVPC(vpcId)
subnetIDs, err := s.listPublicSubnetIDsinVPC(vpcId)
if err != nil {
glog.Error("Error listing subnets in VPC", err)
return nil, err