⚡ update: fix duplicate cert, update tags earlier

vngcloud · May 21, 2024 · 9d1648c · 9d1648c
1 parent 0d66639
commit 9d1648c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/pkg/ingress/controller/annotation.go b/pkg/ingress/controller/annotation.go
@@ -273,7 +273,17 @@ func NewIngressConfig(pService *nwv1.Ingress) *IngressConfig {
 		}
 	}
 	if option, ok := pService.Annotations[ServiceAnnotationCertificateIDs]; ok {
-		opt.CertificateIDs = utils.ParseStringListAnnotation(option, ServiceAnnotationCertificateIDs)
+		arr := utils.ParseStringListAnnotation(option, ServiceAnnotationCertificateIDs)
+		// remove duplicate certificate IDs
+		mapCertIDs := make(map[string]bool)
+		result := []string{}
+		for _, certID := range arr {
+			if !mapCertIDs[certID] {
+				result = append(result, certID)
+				mapCertIDs[certID] = true
+			}
+		}
+		opt.CertificateIDs = result
 	}
 	return opt
 }

diff --git a/pkg/ingress/controller/controller.go b/pkg/ingress/controller/controller.go
@@ -1064,6 +1064,10 @@ func (c *Controller) ensureLoadBalancerInstance(inspect *Expander) (string, erro
 			klog.Errorf("error when create new lb: %v", err)
 			return "", err
 		}
+		err = c.ensureTags(lb.UUID, inspect.serviceConf.Tags)
+		if err != nil {
+			klog.Errorln("error when ensure tags", err)
+		}
 		inspect.serviceConf.LoadBalancerID = lb.UUID
 		vngcloudutil.WaitForLBActive(c.vLBSC, c.getProjectID(), inspect.serviceConf.LoadBalancerID)
 	}
@@ -1099,6 +1103,11 @@ func (c *Controller) actionCompareIngress(lbID string, oldIngExpander, newIngExp
 	var err error
 	vngcloudutil.WaitForLBActive(c.vLBSC, c.getProjectID(), lbID)
 
+	err = c.ensureTags(lbID, newIngExpander.serviceConf.Tags)
+	if err != nil {
+		klog.Errorln("error when ensure tags", err)
+	}
+
 	curLBExpander, err := c.inspectCurrentLB(lbID)
 	if err != nil {
 		klog.Errorln("error when inspect current lb", err)
@@ -1196,10 +1205,6 @@ func (c *Controller) actionCompareIngress(lbID string, oldIngExpander, newIngExp
 	if err != nil {
 		klog.Errorln("error when ensure security groups", err)
 	}
-	err = c.ensureTags(lbID, newIngExpander.serviceConf.Tags)
-	if err != nil {
-		klog.Errorln("error when ensure security groups", err)
-	}
 
 	// delete redundant policy and pool if in oldIng
 	// with id from curLBExpander

diff --git a/pkg/vngcloud/vlb.go b/pkg/vngcloud/vlb.go
@@ -587,6 +587,10 @@ func (c *vLB) ensureLoadBalancerInstance(inspect *Expander) (string, error) {
 			klog.Errorf("error when create new lb: %v", err)
 			return "", err
 		}
+		err = c.ensureTags(lb.UUID, inspect.serviceConf.Tags)
+		if err != nil {
+			klog.Errorln("error when ensure tags", err)
+		}
 		inspect.serviceConf.LoadBalancerID = lb.UUID
 		vngcloudutil.WaitForLBActive(c.vLBSC, c.getProjectID(), inspect.serviceConf.LoadBalancerID)
 	}
@@ -664,6 +668,11 @@ func (c *vLB) actionCompareIngress(lbID string, oldIngExpander, newIngExpander *
 	var err error
 	vngcloudutil.WaitForLBActive(c.vLBSC, c.getProjectID(), lbID)
 
+	err = c.ensureTags(lbID, newIngExpander.serviceConf.Tags)
+	if err != nil {
+		klog.Errorln("error when ensure tags", err)
+	}
+
 	// ensure all from newIngExpander
 	mapPoolNameIndex := make(map[string]int)
 	for poolIndex, ipool := range newIngExpander.PoolExpander {
@@ -702,10 +711,6 @@ func (c *vLB) actionCompareIngress(lbID string, oldIngExpander, newIngExpander *
 	if err != nil {
 		klog.Errorln("error when ensure security groups", err)
 	}
-	err = c.ensureTags(lbID, newIngExpander.serviceConf.Tags)
-	if err != nil {
-		klog.Errorln("error when ensure security groups", err)
-	}
 
 	// delete redundant policy and pool if in oldIng
 	// with id from curLBExpander