cni-server: add static fdb entry for subnets with u2o enabled (#6269)

Signed-off-by: zhangzujian <zhangzujian.7@gmail.com>

Author: zhangzujian

hack/modelgen.sh

@@ -4,25 +4,30 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+OVS_VERSION="3.3"
 OVN_VERSION="24.03"
 
-# download ovn nb/sb schema files
+# download vswitch/nb/sb schema files
+curl -sSf -L --retry 5 -o vswitch.ovsschema \
+    https://raw.githubusercontent.com/openvswitch/ovs/refs/heads/branch-${OVS_VERSION}/vswitchd/vswitch.ovsschema
 curl -sSf -L --retry 5 -o ovn-nb.ovsschema \
     https://raw.githubusercontent.com/ovn-org/ovn/refs/heads/branch-${OVN_VERSION}/ovn-nb.ovsschema
 curl -sSf -L --retry 5 -o ovn-sb.ovsschema \
     https://raw.githubusercontent.com/ovn-org/ovn/refs/heads/branch-${OVN_VERSION}/ovn-sb.ovsschema
 
 # remove old generated files
-rm -rf pkg/ovsdb/ovnnb pkg/ovsdb/ovnsb
+rm -rfv pkg/ovsdb/vswitch pkg/ovsdb/ovnnb pkg/ovsdb/ovnsb
 
-# generate go code from ovn nb/sb schema files
+# generate go code from vswitch/nb/sb schema files
+go tool github.com/ovn-kubernetes/libovsdb/cmd/modelgen \
+    -p vswitch -o pkg/ovsdb/vswitch vswitch.ovsschema
 go tool github.com/ovn-kubernetes/libovsdb/cmd/modelgen \
     -p ovnnb -o pkg/ovsdb/ovnnb ovn-nb.ovsschema
 go tool github.com/ovn-kubernetes/libovsdb/cmd/modelgen \
     -p ovnsb -o pkg/ovsdb/ovnsb ovn-sb.ovsschema
 
 # remove downloaded schema files
-rm -f ovn-nb.ovsschema ovn-sb.ovsschema
+rm -fv vswitch.ovsschema ovn-nb.ovsschema ovn-sb.ovsschema
 
 # add generated files to git
-git add pkg/ovsdb/ovnnb pkg/ovsdb/ovnsb
+git add pkg/ovsdb/vswitch pkg/ovsdb/ovnnb pkg/ovsdb/ovnsb

mocks/pkg/ovs/interface.go

@@ -988,6 +988,9 @@ func (c *Controller) Run(ctx context.Context) {
 	c.initResourceOnce()
 	<-ctx.Done()
 	klog.Info("Shutting down workers")
+
+	c.OVNNbClient.Close()
+	c.OVNSbClient.Close()
 }
 
 func (c *Controller) dbStatus() {

pkg/controller/controller.go

@@ -6,6 +6,7 @@ import (
 	"slices"
 	"strconv"
 	"strings"
+	"sync"
 	"time"
 
 	nadutils "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/utils"
@@ -71,6 +72,11 @@ type Controller struct {
 	localNamespace string
 
 	k8sExec k8sexec.Interface
+
+	// channel used for fdb sync
+	fdbSyncChan   chan struct{}
+	fdbSyncMutex  sync.Mutex
+	vswitchClient ovs.Vswitch
 }
 
 func newTypedRateLimitingQueue[T comparable](name string, rateLimiter workqueue.TypedRateLimiter[T]) workqueue.TypedRateLimitingInterface[T] {
@@ -125,6 +131,8 @@ func NewController(config *Configuration, stopCh <-chan struct{}, podInformerFac
 
 		recorder: recorder,
 		k8sExec:  k8sexec.New(),
+
+		fdbSyncChan: make(chan struct{}, 1),
 	}
 
 	node, err := config.KubeClient.CoreV1().Nodes().Get(context.Background(), config.NodeName, metav1.GetOptions{})
@@ -180,6 +188,10 @@ func NewController(config *Configuration, stopCh <-chan struct{}, podInformerFac
 		return nil, err
 	}
 
+	if controller.vswitchClient, err = ovs.NewVswitchClient("unix:/var/run/openvswitch/db.sock", 1, 3); err != nil {
+		return nil, fmt.Errorf("failed to create vswitch client: %w", err)
+	}
+
 	return controller, nil
 }
 
@@ -521,6 +533,7 @@ func (c *Controller) processNextSubnetWorkItem() bool {
 
 	err := func(obj *subnetEvent) error {
 		defer c.subnetQueue.Done(obj)
+		c.requestFdbSync()
 		if err := c.reconcileRouters(obj); err != nil {
 			c.subnetQueue.AddRateLimited(obj)
 			return fmt.Errorf("error syncing %v: %w, requeuing", obj, err)
@@ -656,6 +669,7 @@ func (c *Controller) Run(stopCh <-chan struct{}) {
 	defer c.subnetQueue.ShutDown()
 	defer c.serviceQueue.ShutDown()
 	defer c.updatePodQueue.ShutDown()
+	defer c.vswitchClient.Close()
 
 	go wait.Until(ovs.CleanLostInterface, time.Minute, stopCh)
 	go wait.Until(recompute, 10*time.Minute, stopCh)
@@ -714,6 +728,9 @@ func (c *Controller) Run(stopCh <-chan struct{}) {
 	// Start OpenFlow sync loop
 	go c.runFlowSync(stopCh)
 
+	// start fdb sync loop
+	go c.runFdbSync(stopCh)
+
 	<-stopCh
 	klog.Info("Shutting down workers")
 }