fix ovs fdb for the local bridge port (#2014)

kubeovn · Nov 7, 2022 · bf93c45 · bf93c45
1 parent 5783015
commit bf93c45
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/pkg/daemon/ovs_linux.go b/pkg/daemon/ovs_linux.go
@@ -541,11 +541,6 @@ func configProviderNic(nicName, brName string) (int, error) {
 		return 0, fmt.Errorf("failed to get routes on nic %s: %v", nicName, err)
 	}
 
-	if _, err = ovs.Exec(ovs.MayExist, "add-port", brName, nicName,
-		"--", "set", "port", nicName, "external_ids:vendor="+util.CniTypeName); err != nil {
-		return 0, fmt.Errorf("failed to add %s to OVS bridge %s: %v", nicName, brName, err)
-	}
-
 	for _, addr := range addrs {
 		if addr.IP.IsLinkLocalUnicast() {
 			// skip 169.254.0.0/16 and fe80::/10
@@ -604,6 +599,11 @@ func configProviderNic(nicName, brName string) (int, error) {
 		}
 	}
 
+	if _, err = ovs.Exec(ovs.MayExist, "add-port", brName, nicName,
+		"--", "set", "port", nicName, "external_ids:vendor="+util.CniTypeName); err != nil {
+		return 0, fmt.Errorf("failed to add %s to OVS bridge %s: %v", nicName, brName, err)
+	}
+
 	if err = netlink.LinkSetUp(nic); err != nil {
 		return 0, fmt.Errorf("failed to set link %s up: %v", nicName, err)
 	}