Remove check that forces loadBalancerSourceRanges to be 0.0.0.0/0. Also, remove…

Remove check that forces loadBalancerSourceRanges to be 0.0.0.0/0. Also, remove check that forces service.beta.kubernetes.io/aws-load-balancer-internal annotation to be 0.0.0.0/0. Ideally, it should be a boolean, but for backward compatibility, leaving it to be a non-empty value

Remove check that forces loadBalancerSourceRanges to be 0.0.0.0/0. Also, remove…
e4bebc7c · Dhawal Patel · 9ada26d6 · e4bebc7c
Commit e4bebc7c authored Dec 12, 2016 by Dhawal Patel
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 7 deletions

aws.go pkg/cloudprovider/providers/aws/aws.go +0 -7

No files found.
--- a/pkg/cloudprovider/providers/aws/aws.go
+++ b/pkg/cloudprovider/providers/aws/aws.go
@@ -2315,13 +2315,6 @@ func (c *Cloud) EnsureLoadBalancer(apiService *api.Service, hosts []string) (*ap
 	internalELB := false
 	internalAnnotation := apiService.Annotations[ServiceAnnotationLoadBalancerInternal]
 	if internalAnnotation != "" {
-		if internalAnnotation != "0.0.0.0/0" {
-			return nil, fmt.Errorf("annotation %q=%q detected, but the only value supported currently is 0.0.0.0/0", ServiceAnnotationLoadBalancerInternal, internalAnnotation)
-		}
-		if !service.IsAllowAll(sourceRanges) {
-			// TODO: Unify the two annotations
-			return nil, fmt.Errorf("source-range annotation cannot be combined with the internal-elb annotation")
-		}
 		internalELB = true
 	}