Merge pull request #61 from hello2mao/delete-annotation-after-delete-…

…lb-service delete annotation after delete lb service
kubernetes-retired · Mar 26, 2019 · 43ec4dd · 43ec4dd
2 parents b46b977 + b28a666
commit 43ec4dd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/pkg/cloud-provider/load_balancer.go b/pkg/cloud-provider/load_balancer.go
@@ -163,11 +163,17 @@ func (bc *Baiducloud) EnsureLoadBalancerDeleted(ctx context.Context, clusterName
 
 	// delete EIP
 	if result.LoadBalancerInternalVpc == "true" {
+		if service.Annotations != nil {
+			delete(service.Annotations, ServiceAnnotationLoadBalancerId)
+		}
 		glog.V(3).Infof("[%v %v] EnsureLoadBalancerDeleted: use LoadBalancerInternalVpc, no EIP to delete", service.Namespace, service.Name, lb.Address)
 		glog.V(2).Infof("[%v %v] EnsureLoadBalancerDeleted: delete %v FINISH", serviceName, clusterName, serviceName)
 		return nil
 	}
 	if len(service.Spec.LoadBalancerIP) != 0 {
+		if service.Annotations != nil {
+			delete(service.Annotations, ServiceAnnotationLoadBalancerId)
+		}
 		glog.V(3).Infof("[%v %v] EnsureLoadBalancerDeleted: LoadBalancerIP is set, not delete EIP.", serviceName, clusterName)
 		glog.V(2).Infof("[%v %v] EnsureLoadBalancerDeleted: delete %v FINISH", serviceName, clusterName, serviceName)
 		return nil
@@ -187,7 +193,9 @@ func (bc *Baiducloud) EnsureLoadBalancerDeleted(ctx context.Context, clusterName
 	if err != nil {
 		return err
 	}
-
+	if service.Annotations != nil {
+		delete(service.Annotations, ServiceAnnotationLoadBalancerId)
+	}
 	glog.V(2).Infof("[%v %v] EnsureLoadBalancerDeleted: delete %v FINISH", serviceName, clusterName, serviceName)
 	return nil
 }
diff --git a/pkg/cloud-provider/load_balancer_blb.go b/pkg/cloud-provider/load_balancer_blb.go
@@ -150,12 +150,15 @@ func (bc *Baiducloud) waitForLoadBalancer(lb *blb.LoadBalancer) (*blb.LoadBalanc
 			return newlb, err
 		}
 		if !exist {
-			glog.V(3).Infof("getBCELoadBalancer not exist: %s", lb.BlbId)
-			return newlb, fmt.Errorf("BLB not exists:%s", lb.BlbId)
+			glog.V(3).Infof("getBCELoadBalancer not exist: %s, retry", lb.BlbId)
+			if index >= 9 {
+				return newlb, fmt.Errorf("BLB not exists:%s", lb.BlbId)
+			}
+			continue
 		}
 		lb = newlb
 		glog.V(3).Infof("BLB status is : %s", lb.Status)
-		if index == 9 && lb.Status != "available" {
+		if index >= 9 && lb.Status != "available" {
 			return nil, fmt.Errorf("waitForLoadBalancer failed after retry")
 		}
 	}