np: allow icmpv6 to ipv6 ready check

So that we can remove trigger all np updates when subnet gw or uo2ip change.

Signed-off-by: Mengxin Liu <liumengxinfly@gmail.com>

Author: oilbeater

mocks/pkg/ovs/interface.go

@@ -149,15 +149,13 @@ func (c *Controller) handleUpdateNp(key string) error {
 		return err
 	}
 
-	var subnets []*kubeovnv1.Subnet
 	protocolSet := strset.NewWithSize(2)
 	for _, subnetName := range subnetNames {
 		subnet, err := c.subnetsLister.Get(subnetName)
 		if err != nil {
 			klog.Errorf("failed to get pod's subnet %s, %v", subnetName, err)
 			return err
 		}
-		subnets = append(subnets, subnet)
 
 		if subnet.Spec.Protocol == kubeovnv1.ProtocolDual {
 			protocolSet.Add(kubeovnv1.ProtocolIPv4, kubeovnv1.ProtocolIPv6)
@@ -468,12 +466,10 @@ func (c *Controller) handleUpdateNp(key string) error {
 		}
 	}
 
-	if !enforcementLax {
-		for _, subnet := range subnets {
-			if err = c.OVNNbClient.CreateGatewayACL("", pgName, subnet.Spec.Gateway, subnet.Status.U2OInterconnectionIP); err != nil {
-				klog.Errorf("create gateway acl: %v", err)
-				return err
-			}
+	if !enforcementLax && protocolSet.Has(kubeovnv1.ProtocolIPv6) {
+		if err = c.OVNNbClient.CreateGatewayACL("", pgName); err != nil {
+			klog.Errorf("create gateway acl: %v", err)
+			return err
 		}
 	}
 	return nil

pkg/controller/network_policy.go

@@ -65,20 +65,6 @@ func (c *Controller) enqueueUpdateSubnet(oldObj, newObj any) {
 	newSubnet := newObj.(*kubeovnv1.Subnet)
 	key := cache.MetaObjectToName(newSubnet).String()
 
-	// Trigger network policy refresh only if they are enabled, otherwise the lister will be nil
-	if c.npsLister != nil {
-		if newSubnet.Spec.Gateway != oldSubnet.Spec.Gateway || newSubnet.Status.U2OInterconnectionIP != oldSubnet.Status.U2OInterconnectionIP {
-			policies, err := c.npsLister.List(labels.Everything())
-			if err != nil {
-				klog.Errorf("failed to list network policies: %v", err)
-			} else {
-				for _, np := range policies {
-					c.enqueueAddNp(np)
-				}
-			}
-		}
-	}
-
 	if newSubnet.Spec.Protocol == kubeovnv1.ProtocolIPv6 {
 		usingIPs = newSubnet.Status.V6UsingIPs
 	} else {

pkg/controller/subnet.go

@@ -21,7 +21,6 @@ func pingGateway(gw, src string, verbose bool, maxRetry int, done chan struct{})
 		return 0, fmt.Errorf("failed to init pinger: %w", err)
 	}
 	pinger.SetPrivileged(true)
-	// CNITimeoutSec = 220, cannot exceed
 	pinger.Count = maxRetry
 	pinger.Timeout = time.Duration(maxRetry) * time.Second
 	pinger.Interval = time.Second
@@ -49,12 +48,10 @@ func pingGateway(gw, src string, verbose bool, maxRetry int, done chan struct{})
 			finish <- struct{}{}
 		}
 		go func() {
-			// stop pinger when cancel signal received
 			select {
 			case <-done:
 				pinger.Stop()
 			case <-finish:
-				// do nothing here
 			}
 		}()
 	}
@@ -76,7 +73,6 @@ func pingGateway(gw, src string, verbose bool, maxRetry int, done chan struct{})
 	if verbose {
 		klog.Infof("%s network ready after %d ping to gateway %s", src, pinger.PacketsSent, gw)
 	}
-
 	return pinger.PacketsSent, nil
 }
 

pkg/daemon/ovs.go

@@ -616,7 +616,7 @@ func waitNetworkReady(nic, ipAddr, gateway string, verbose bool, maxRetry int, d
 				return err
 			}
 			if verbose {
-				klog.Infof("MAC addresses of gateway %s is %s", gw, mac.String())
+				klog.Infof("MAC address of gateway %s is %s", gw, mac.String())
 				klog.Infof("network %s with gateway %s is ready for interface %s after %d checks", ips[i], gw, nic, count)
 			}
 		} else {

pkg/daemon/ovs_linux.go

@@ -163,7 +163,7 @@ type ACL interface {
 	UpdateDefaultBlockExceptionsACLOps(npName, pgName, npNamespace, direction string) ([]ovsdb.Operation, error)
 	UpdateIngressACLOps(pgName, asIngressName, asExceptName, protocol, aclName string, npp []netv1.NetworkPolicyPort, logEnable bool, logACLActions []ovnnb.ACLAction, logRate int, namedPortMap map[string]*util.NamedPortInfo) ([]ovsdb.Operation, error)
 	UpdateEgressACLOps(pgName, asEgressName, asExceptName, protocol, aclName string, npp []netv1.NetworkPolicyPort, logEnable bool, logACLActions []ovnnb.ACLAction, logRate int, namedPortMap map[string]*util.NamedPortInfo) ([]ovsdb.Operation, error)
-	CreateGatewayACL(lsName, pgName, gateway, u2oInterconnectionIP string) error
+	CreateGatewayACL(lsName, pgName string) error
 	CreateNodeACL(pgName, nodeIPStr, joinIPStr string) error
 	CreateSgDenyAllACL(sgName string) error
 	CreateSgBaseACL(sgName, direction string) error