AWS: Eliminate assumptions about all load-balancer ports matching

It costs us basically nothing to just check all the ports, and
protects us against future changes to the controller.
This commit is contained in:
Justin Santa Barbara 2016-01-20 09:30:46 -05:00
parent a5d2c1b0fb
commit 0586d866de

View File

@ -1700,10 +1700,11 @@ func (s *AWSCloud) EnsureLoadBalancer(name, region string, publicIP net.IP, port
return nil, fmt.Errorf("requested load balancer with no ports") return nil, fmt.Errorf("requested load balancer with no ports")
} }
// The service controller verified all the protocols match on the ports, just check and use the first one for _, port := range ports {
if ports[0].Protocol != api.ProtocolTCP { if port.Protocol != api.ProtocolTCP {
return nil, fmt.Errorf("Only TCP LoadBalancer is supported for AWS ELB") return nil, fmt.Errorf("Only TCP LoadBalancer is supported for AWS ELB")
} }
}
if publicIP != nil { if publicIP != nil {
return nil, fmt.Errorf("publicIP cannot be specified for AWS ELB") return nil, fmt.Errorf("publicIP cannot be specified for AWS ELB")