From e5c87f59e9699ed41162cd28ae81456e755495f5 Mon Sep 17 00:00:00 2001 From: Justin Santa Barbara Date: Mon, 29 Feb 2016 20:56:39 -0500 Subject: [PATCH] LB Source Ranges: Move validation into API layer Had to move other things around too to avoid a weird api -> cloudprovider dependency. Also adding fixes per code reviews. (This is a squash of the previously approved commits) --- pkg/cloudprovider/providers/openstack/openstack.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkg/cloudprovider/providers/openstack/openstack.go b/pkg/cloudprovider/providers/openstack/openstack.go index a8fffac..5737867 100644 --- a/pkg/cloudprovider/providers/openstack/openstack.go +++ b/pkg/cloudprovider/providers/openstack/openstack.go @@ -45,6 +45,7 @@ import ( "github.com/golang/glog" "k8s.io/kubernetes/pkg/api" "k8s.io/kubernetes/pkg/api/resource" + "k8s.io/kubernetes/pkg/api/service" "k8s.io/kubernetes/pkg/cloudprovider" "k8s.io/kubernetes/pkg/types" ) @@ -685,12 +686,12 @@ func (lb *LoadBalancer) EnsureLoadBalancer(name, region string, loadBalancerIP n return nil, fmt.Errorf("unsupported load balancer affinity: %v", affinity) } - sourceRanges, err := cloudprovider.GetSourceRangeAnnotations(annotations) + sourceRanges, err := service.GetLoadBalancerSourceRanges(annotations) if err != nil { return nil, err } - if !cloudprovider.IsAllowAll(sourceRanges) { + if !service.IsAllowAll(sourceRanges) { return nil, fmt.Errorf("Source range restrictions are not supported for openstack load balancers") }