🔨 fix: not create lb when inspect ingress got error

vngcloud · Mar 21, 2024 · 8fce164 · 8fce164
1 parent d98bf89
commit 8fce164
Showing 4 changed files with 10 additions and 15 deletions.
diff --git a/go.mod b/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/viper v1.15.0
 	github.com/stretchr/testify v1.8.4
-	github.com/vngcloud/vngcloud-go-sdk v0.0.0-20240315042240-fadf32d4b9eb
+	github.com/vngcloud/vngcloud-go-sdk v0.0.0-20240319100753-40d72148ed5d
 	k8s.io/api v0.29.0
 	k8s.io/apimachinery v0.29.0
 	k8s.io/client-go v0.29.0

diff --git a/go.sum b/go.sum
@@ -278,10 +278,8 @@ github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcU
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/subosito/gotenv v1.4.2 h1:X1TuBLAMDFbaTAChgCBLu3DU3UPyELpnF2jjJ2cz/S8=
 github.com/subosito/gotenv v1.4.2/go.mod h1:ayKnFf/c6rvx/2iiLrJUk1e6plDbT3edrFNGqEflhK0=
-github.com/vngcloud/vngcloud-go-sdk v0.0.0-20240314071638-db934864f66e h1:uQOKi9dZ8UuNeWfsEYrMbsAisTNw94bgrR6GDXx7z2c=
-github.com/vngcloud/vngcloud-go-sdk v0.0.0-20240314071638-db934864f66e/go.mod h1:ooZo+kYuaDbn1HzS8KUEORKGj68yEtDx1XLJU06Xw4k=
-github.com/vngcloud/vngcloud-go-sdk v0.0.0-20240315042240-fadf32d4b9eb h1:sbmVNj3Sc4K/ureoD9O9cjWU2TpFmEJjZ8s3qWon24E=
-github.com/vngcloud/vngcloud-go-sdk v0.0.0-20240315042240-fadf32d4b9eb/go.mod h1:ooZo+kYuaDbn1HzS8KUEORKGj68yEtDx1XLJU06Xw4k=
+github.com/vngcloud/vngcloud-go-sdk v0.0.0-20240319100753-40d72148ed5d h1:3LE7xzWmPe4feQ/kbl48G3VMpWc7ccugiq1YpHePHmE=
+github.com/vngcloud/vngcloud-go-sdk v0.0.0-20240319100753-40d72148ed5d/go.mod h1:ooZo+kYuaDbn1HzS8KUEORKGj68yEtDx1XLJU06Xw4k=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=

diff --git a/pkg/ingress/controller/api.go b/pkg/ingress/controller/api.go
@@ -148,12 +148,8 @@ func (c *API) ListPoolOfLB(lbID string) ([]*lObjects.Pool, error) {
 
 func (c *API) UpdatePoolMember(lbID, poolID string, mems []*pool.Member) error {
 	logrus.Infoln("*****API__UpdatePoolMember: ", "poolID: ", poolID, "ProjectID: ", c.ProjectID, "mems: ", mems)
-	newMems := make([]pool.Member, len(mems))
-	for i, mem := range mems {
-		newMems[i] = *mem
-	}
 	opt := &pool.UpdatePoolMembersOpts{
-		Members: newMems,
+		Members: mems,
 	}
 	opt.ProjectID = c.ProjectID
 	opt.LoadBalancerID = lbID

diff --git a/pkg/ingress/controller/controller.go b/pkg/ingress/controller/controller.go
@@ -920,11 +920,6 @@ func (c *Controller) inspectIngress(ing *nwv1.Ingress) (*IngressInspect, error)
 
 func (c *Controller) ensureCompareIngress(oldIng, ing *nwv1.Ingress) (*lObjects.LoadBalancer, error) {
 	klog.Infof("----------------- ensureCompareIngress(%s/%s) ------------------", ing.Namespace, ing.Name)
-	lbID, err := c.ensureLoadBalancer(ing)
-	if err != nil {
-		logrus.Errorln("error when ensure loadbalancer", err)
-		return nil, err
-	}
 
 	oldIngExpander, err := c.inspectIngress(oldIng)
 	if err != nil {
@@ -941,6 +936,12 @@ func (c *Controller) ensureCompareIngress(oldIng, ing *nwv1.Ingress) (*lObjects.
 		return nil, err
 	}
 
+	lbID, err := c.ensureLoadBalancer(ing)
+	if err != nil {
+		logrus.Errorln("error when ensure loadbalancer", err)
+		return nil, err
+	}
+
 	lb, err := c.actionCompareIngress(lbID, oldIngExpander, newIngExpander)
 	if err != nil {
 		logrus.Errorln("error when compare ingress", err)