fix: wrong usage about DeepEqual (#3396)

Signed-off-by: bobz965 <[email protected]>
kubeovn · Nov 10, 2023 · 7778560 · 7778560
1 parent 8d32489
commit 7778560
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 11 deletions.
diff --git a/pkg/controller/external_gw.go b/pkg/controller/external_gw.go
@@ -78,7 +78,7 @@ func (c *Controller) removeExternalGateway() error {
 	sel, _ := metav1.LabelSelectorAsSelector(&metav1.LabelSelector{MatchLabels: map[string]string{util.ExGatewayLabel: "true"}})
 	nodes, err := c.nodesLister.List(sel)
 	if err != nil {
-		klog.Errorf("failed to list nodes, %v", err)
+		klog.Errorf("failed to list external gw nodes, %v", err)
 		return err
 	}
 	for _, cachedNode := range nodes {
@@ -223,10 +223,13 @@ func (c *Controller) getGatewayChassis(config map[string]string) ([]string, erro
 		gwNodes = append(gwNodes, node.Name)
 	}
 	if config["type"] != "distributed" {
-		gwNodes = strings.Split(config["external-gw-nodes"], ",")
+		nodeNames := strings.Split(config["external-gw-nodes"], ",")
+		for _, name := range nodeNames {
+			name = strings.TrimSpace(name)
+			gwNodes = append(gwNodes, name)
+		}
 	}
 	for _, gw := range gwNodes {
-		gw = strings.TrimSpace(gw)
 		cachedNode, err := c.nodesLister.Get(gw)
 		if err != nil {
 			klog.Errorf("failed to get gw node %s, %v", gw, err)

diff --git a/pkg/controller/ovn_eip.go b/pkg/controller/ovn_eip.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"reflect"
 	"strings"
 	"time"
 
@@ -56,8 +55,8 @@ func (c *Controller) enqueueUpdateOvnEip(oldObj, newObj interface{}) {
 		c.resetOvnEipQueue.Add(key)
 		return
 	}
-	if !reflect.DeepEqual(oldEip.Spec.V4Ip, newEip.Spec.V4Ip) ||
-		!reflect.DeepEqual(oldEip.Spec.V6Ip, newEip.Spec.V6Ip) {
+	if oldEip.Spec.V4Ip != newEip.Spec.V4Ip ||
+		oldEip.Spec.V6Ip != newEip.Spec.V6Ip {
 		klog.Infof("enqueue update ovn eip %s", key)
 		c.updateOvnEipQueue.Add(key)
 	}

diff --git a/pkg/controller/ovn_fip.go b/pkg/controller/ovn_fip.go
@@ -4,7 +4,6 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"reflect"
 	"strconv"
 
 	k8serrors "k8s.io/apimachinery/pkg/api/errors"
@@ -55,8 +54,8 @@ func (c *Controller) enqueueUpdateOvnFip(oldObj, newObj interface{}) {
 		klog.Infof("enqueue reset old ovn eip %s", oldFip.Spec.OvnEip)
 		c.resetOvnEipQueue.Add(oldFip.Spec.OvnEip)
 	}
-	if !reflect.DeepEqual(oldFip.Spec.IPName, newFip.Spec.IPName) ||
-		!reflect.DeepEqual(oldFip.Spec.IPType, newFip.Spec.IPType) {
+	if oldFip.Spec.IPName != newFip.Spec.IPName ||
+		oldFip.Spec.IPType != newFip.Spec.IPType {
 		klog.Infof("enqueue update fip %s", key)
 		c.updateOvnFipQueue.Add(key)
 		return

diff --git a/pkg/controller/vpc.go b/pkg/controller/vpc.go
@@ -51,10 +51,10 @@ func (c *Controller) enqueueUpdateVpc(oldObj, newObj interface{}) {
 		!reflect.DeepEqual(oldVpc.Spec.StaticRoutes, newVpc.Spec.StaticRoutes) ||
 		!reflect.DeepEqual(oldVpc.Spec.PolicyRoutes, newVpc.Spec.PolicyRoutes) ||
 		!reflect.DeepEqual(oldVpc.Spec.VpcPeerings, newVpc.Spec.VpcPeerings) ||
-		!reflect.DeepEqual(oldVpc.Spec.EnableExternal, newVpc.Spec.EnableExternal) ||
-		!reflect.DeepEqual(oldVpc.Spec.EnableBfd, newVpc.Spec.EnableBfd) ||
 		!reflect.DeepEqual(oldVpc.Annotations, newVpc.Annotations) ||
 		!reflect.DeepEqual(oldVpc.Spec.ExtraExternalSubnets, newVpc.Spec.ExtraExternalSubnets) ||
+		oldVpc.Spec.EnableExternal != newVpc.Spec.EnableExternal ||
+		oldVpc.Spec.EnableBfd != newVpc.Spec.EnableBfd ||
 		oldVpc.Labels[util.VpcExternalLabel] != newVpc.Labels[util.VpcExternalLabel] {
 		// TODO:// label VpcExternalLabel replace with spec enable external
 		var (