Merge pull request #79 from hello2mao/blb-exact-match-issue

fix blb exact match issue

pkg/cloud-provider/cce.go

@@ -27,12 +27,12 @@ import (
 	"k8s.io/api/core/v1"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes"
+	"k8s.io/client-go/kubernetes/scheme"
+	v1core "k8s.io/client-go/kubernetes/typed/core/v1"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/kubernetes/pkg/cloudprovider"
 	"k8s.io/kubernetes/pkg/controller"
-	"k8s.io/client-go/kubernetes/scheme"
-	v1core "k8s.io/client-go/kubernetes/typed/core/v1"
 
 	"k8s.io/cloud-provider-baiducloud/pkg/cloud-sdk/bce"
 	"k8s.io/cloud-provider-baiducloud/pkg/cloud-sdk/clientset"
@@ -47,8 +47,8 @@ const CceUserAgent = "cce-k8s:"
 // Baiducloud defines the main struct
 type Baiducloud struct {
 	CloudConfig
-	clientSet  clientset.Interface
-	kubeClient kubernetes.Interface
+	clientSet        clientset.Interface
+	kubeClient       kubernetes.Interface
 	eventBroadcaster record.EventBroadcaster
 	eventRecorder    record.EventRecorder
 }

pkg/cloud-provider/cidr_test.go

@@ -22,11 +22,11 @@ func TestVerifyNoOverlap(t *testing.T) {
 	if err != nil {
 		t.Error(err)
 	}
-	err = VerifyNoOverlap([]*net.IPNet{cceCidr, customRightCidr,}, cidrBlock)
+	err = VerifyNoOverlap([]*net.IPNet{cceCidr, customRightCidr}, cidrBlock)
 	if err != nil {
 		t.Error(err)
 	}
-	err = VerifyNoOverlap([]*net.IPNet{cceCidr, customWrongCidr,}, cidrBlock)
+	err = VerifyNoOverlap([]*net.IPNet{cceCidr, customWrongCidr}, cidrBlock)
 	if err != nil {
 		t.Log(err)
 	}

pkg/cloud-provider/load_balancer_blb.go

@@ -69,6 +69,7 @@ func (bc *Baiducloud) ensureBLB(ctx context.Context, clusterName string, service
 		glog.V(3).Infof("[%v %v] EnsureLoadBalancer create blb success, BLB name: %s, BLB id: %s, BLB address: %s.", service.Namespace, service.Name, resp.Name, resp.LoadBalancerId, resp.Address)
 		argsDesc := blb.DescribeLoadBalancersArgs{
 			LoadBalancerId: resp.LoadBalancerId,
+			ExactlyMatch:   true,
 		}
 		lbs, err := bc.clientSet.Blb().DescribeLoadBalancers(&argsDesc)
 		if err != nil {

pkg/cloud-provider/load_balancer_blb_listener.go

@@ -126,10 +126,10 @@ func (bc *Baiducloud) updateListener(lb *blb.LoadBalancer, pl PortListener) erro
 	switch pl.Protocol {
 	case "UDP":
 		args := blb.UpdateUDPListenerArgs{
-			LoadBalancerId: lb.BlbId,
-			ListenerPort:   pl.Port,
-			BackendPort:    int(pl.NodePort),
-			Scheduler:      "RoundRobin",
+			LoadBalancerId:    lb.BlbId,
+			ListenerPort:      pl.Port,
+			BackendPort:       int(pl.NodePort),
+			Scheduler:         "RoundRobin",
 			HealthCheckString: "HealthCheck",
 		}
 		err := bc.clientSet.Blb().UpdateUDPListener(&args)

pkg/cloud-provider/load_balancer_util.go

@@ -70,6 +70,7 @@ func (bc *Baiducloud) getBCELoadBalancer(name string) (lb *blb.LoadBalancer, exi
 	}
 	args := blb.DescribeLoadBalancersArgs{
 		LoadBalancerName: name,
+		ExactlyMatch:     true,
 	}
 	lbs, err := bc.clientSet.Blb().DescribeLoadBalancers(&args)
 	if err != nil {
@@ -89,6 +90,7 @@ func (bc *Baiducloud) getBCELoadBalancerById(id string) (lb *blb.LoadBalancer, e
 	}
 	args := blb.DescribeLoadBalancersArgs{
 		LoadBalancerId: id,
+		ExactlyMatch:   true,
 	}
 	lbs, err := bc.clientSet.Blb().DescribeLoadBalancers(&args)
 	if err != nil {

pkg/cloud-provider/options_test.go

@@ -12,8 +12,7 @@ func buildService() *api.Service {
 			Name:      "foo",
 			Namespace: api.NamespaceDefault,
 		},
-		Spec: api.ServiceSpec{
-		},
+		Spec: api.ServiceSpec{},
 	}
 }
 

pkg/cloud-provider/routes.go

@@ -285,8 +285,8 @@ func (bc *Baiducloud) routeTableConflictDetection(rs []vpc.RouteRule) {
 				glog.V(4).Infof("RouteTable conflict detected, custom routeRule %v may conflict with cce routeRule %v", otherRR[i], cceRR[j])
 				if bc.eventRecorder != nil {
 					bc.eventRecorder.Eventf(&v1.ObjectReference{
-						Kind:      "VPC",
-						Name:      "RouteTableConflict",
+						Kind: "VPC",
+						Name: "RouteTableConflict",
 					}, v1.EventTypeWarning, "RouteTableConflictDetection", "RouteTable conflict detected, custom routeRule %v may conflict with cce routeRule %v", otherRR[i], cceRR[j])
 				}
 			}
@@ -312,7 +312,7 @@ func (bc *Baiducloud) isConflict(otherRR vpc.RouteRule, cceRR vpc.RouteRule) boo
 			glog.Errorf("otherRR %v net.ParseCIDR failed: %v", otherRR, err)
 			return false
 		}
-		err = VerifyNoOverlap([]*net.IPNet{cceCidr, otherCidr,}, cidrBlock)
+		err = VerifyNoOverlap([]*net.IPNet{cceCidr, otherCidr}, cidrBlock)
 		if err != nil {
 			glog.Errorf("VerifyNoOverlap: %v", err)
 			return true

pkg/cloud-sdk/blb/loadbalancer.go

@@ -41,6 +41,7 @@ type DescribeLoadBalancersArgs struct {
 	LoadBalancerName string
 	BCCId            string
 	Address          string
+	ExactlyMatch     bool
 }
 
 // DescribeLoadBalancersResponse is the response of DescribeLoadBalancers
@@ -118,11 +119,16 @@ func (c *Client) CreateLoadBalancer(args *CreateLoadBalancerArgs) (*CreateLoadBa
 func (c *Client) DescribeLoadBalancers(args *DescribeLoadBalancersArgs) ([]LoadBalancer, error) {
 	var params map[string]string
 	if args != nil {
+		exactlyMatch := "true"
+		if !args.ExactlyMatch {
+			exactlyMatch = "false"
+		}
 		params = map[string]string{
-			"blbId":   args.LoadBalancerId,
-			"name":    args.LoadBalancerName,
-			"bccId":   args.BCCId,
-			"address": args.Address,
+			"blbId":        args.LoadBalancerId,
+			"name":         args.LoadBalancerName,
+			"bccId":        args.BCCId,
+			"address":      args.Address,
+			"exactlyMatch": exactlyMatch,
 		}
 	}
 	req, err := bce.NewRequest("GET", c.GetURL("v1/blb", params), nil)