netpol: fix packet drop casued by incorrect address set deletion (#2677)

kubeovn · Apr 20, 2023 · 87deba9 · 87deba9
1 parent 385a76a
commit 87deba9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 24 deletions.
diff --git a/pkg/controller/network_policy.go b/pkg/controller/network_policy.go
@@ -242,18 +242,6 @@ func (c *Controller) handleUpdateNp(key string) error {
 		}
 	}
 
-	ingressAsNames, err := c.ovnClient.ListAddressSet(np.Namespace, npName, "ingress")
-	if err != nil {
-		klog.Errorf("failed to list ingress address_set, %v", err)
-		return err
-	}
-	for _, ingressAsName := range ingressAsNames {
-		if err := c.ovnClient.DeleteAddressSet(ingressAsName); err != nil {
-			klog.Errorf("failed to delete np %s address set, %v", key, err)
-			return err
-		}
-	}
-
 	var ingressAclCmd []string
 	exist, err := c.ovnClient.PortGroupExists(pgName)
 	if err != nil {
@@ -389,18 +377,6 @@ func (c *Controller) handleUpdateNp(key string) error {
 		}
 	}
 
-	egressAsNames, err := c.ovnClient.ListAddressSet(np.Namespace, npName, "egress")
-	if err != nil {
-		klog.Errorf("failed to list egress address_set, %v", err)
-		return err
-	}
-	for _, egressAsName := range egressAsNames {
-		if err := c.ovnClient.DeleteAddressSet(egressAsName); err != nil {
-			klog.Errorf("failed to delete np %s address set, %v", key, err)
-			return err
-		}
-	}
-
 	var egressAclCmd []string
 	exist, err = c.ovnClient.PortGroupExists(pgName)
 	if err != nil {

diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go
@@ -1142,6 +1142,9 @@ func (c Client) ListAddressSet(npNamespace, npName, direction string) ([]string,
 		klog.Errorf("failed to list address_set of %s/%s/%s: %v, %q", npNamespace, npName, direction, err, output)
 		return nil, err
 	}
+	if len(output) == 0 {
+		return nil, nil
+	}
 	return strings.Split(output, "\n"), nil
 }