add enable multicast snoop to 1.12 (#4105)

Signed-off-by: clyi <clyi@alauda.io>
kubeovn · May 30, 2024 · 7b4ff3a · 7b4ff3a
1 parent 2286ffa
commit 7b4ff3a
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 0 deletions.
diff --git a/charts/kube-ovn/templates/kube-ovn-crd.yaml b/charts/kube-ovn/templates/kube-ovn-crd.yaml
@@ -1793,6 +1793,8 @@ spec:
                   type: boolean
                 enableEcmp:
                   type: boolean
+                enableMulticastSnoop:
+                  type: boolean
                 routeTable:
                   type: string
   scope: Cluster

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -2334,6 +2334,8 @@ spec:
                   type: boolean
                 enableEcmp:
                   type: boolean
+                enableMulticastSnoop:
+                  type: boolean
                 routeTable:
                   type: string
   scope: Cluster

diff --git a/mocks/pkg/ovs/interface.go b/mocks/pkg/ovs/interface.go
diff --git a/pkg/apis/kubeovn/v1/types.go b/pkg/apis/kubeovn/v1/types.go
@@ -167,6 +167,7 @@ type SubnetSpec struct {
 	U2OInterconnection   bool   `json:"u2oInterconnection,omitempty"`
 	EnableLb             *bool  `json:"enableLb,omitempty"`
 	EnableEcmp           bool   `json:"enableEcmp,omitempty"`
+	EnableMulicastSnoop  bool   `json:"enableMulticastSnoop,omitempty"`
 
 	RouteTable string `json:"routeTable,omitempty"`
 }

diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -124,6 +124,7 @@ func (c *Controller) enqueueUpdateSubnet(oldObj, newObj interface{}) {
 		oldSubnet.Spec.RouteTable != newSubnet.Spec.RouteTable ||
 		oldSubnet.Spec.Vpc != newSubnet.Spec.Vpc ||
 		oldSubnet.Spec.NatOutgoing != newSubnet.Spec.NatOutgoing ||
+		oldSubnet.Spec.EnableMulicastSnoop != newSubnet.Spec.EnableMulicastSnoop ||
 		!reflect.DeepEqual(oldSubnet.Spec.NatOutgoingPolicyRules, newSubnet.Spec.NatOutgoingPolicyRules) ||
 		(newSubnet.Spec.U2OInterconnection && newSubnet.Spec.U2OInterconnectionIP != "" && oldSubnet.Spec.U2OInterconnectionIP != newSubnet.Spec.U2OInterconnectionIP) {
 
@@ -786,6 +787,19 @@ func (c *Controller) handleAddOrUpdateSubnet(key string) error {
 		return err
 	}
 
+	multicastSnoopFlag := map[string]string{"mcast_snoop": "true", "mcast_querier": "false"}
+	if subnet.Spec.EnableMulicastSnoop {
+		if err := c.OVNNbClient.LogicalSwitchUpdateOtherConfig(subnet.Name, ovsdb.MutateOperationInsert, multicastSnoopFlag); err != nil {
+			klog.Errorf("enable logical switch multicast snoop %s: %v", subnet.Name, err)
+			return err
+		}
+	} else {
+		if err := c.OVNNbClient.LogicalSwitchUpdateOtherConfig(subnet.Name, ovsdb.MutateOperationDelete, multicastSnoopFlag); err != nil {
+			klog.Errorf("disable logical switch multicast snoop  %s: %v", subnet.Name, err)
+			return err
+		}
+	}
+
 	subnet.Status.EnsureStandardConditions()
 
 	if err := c.updateSubnetDHCPOption(subnet, needRouter); err != nil {

diff --git a/pkg/ovs/interface.go b/pkg/ovs/interface.go
@@ -52,6 +52,7 @@ type LogicalSwitch interface {
 	CreateLogicalSwitch(lsName, lrName, cidrBlock, gateway string, needRouter, randomAllocateGW bool) error
 	CreateBareLogicalSwitch(lsName string) error
 	LogicalSwitchUpdateLoadBalancers(lsName string, op ovsdb.Mutator, lbNames ...string) error
+	LogicalSwitchUpdateOtherConfig(lsName string, op ovsdb.Mutator, otherConfig map[string]string) error
 	DeleteLogicalSwitch(lsName string) error
 	ListLogicalSwitch(needVendorFilter bool, filter func(ls *ovnnb.LogicalSwitch) bool) ([]ovnnb.LogicalSwitch, error)
 	LogicalSwitchExists(lsName string) (bool, error)

diff --git a/yamls/crd.yaml b/yamls/crd.yaml
@@ -2098,6 +2098,8 @@ spec:
                   type: boolean
                 enableEcmp:
                   type: boolean
+                enableMulticastSnoop:
+                  type: boolean
   scope: Cluster
   names:
     plural: subnets