Revert "support to set NB_Global option mcast_privileged"

This reverts commit 743502c.
kubeovn · Dec 3, 2021 · c3004bb · c3004bb
1 parent 4499505
commit c3004bb
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 23 deletions.
diff --git a/dist/images/Dockerfile.base b/dist/images/Dockerfile.base
@@ -24,7 +24,6 @@ RUN dpkg -i /usr/src/python3-openvswitch*.deb /usr/src/libopenvswitch*.deb
 RUN cd /usr/src/ && git clone -b branch-21.06 --depth=1 https://github.com/ovn-org/ovn.git && \
     cd ovn && \
     curl -s https://github.com/kubeovn/ovn/commit/e24734913d25c0bffdf1cfd79e14ef43d01e1019.patch | git apply && \
-    curl -s https://github.com/kubeovn/ovn/commit/eee4ace8a3dd00f0a067fed0f0cabee46a29aa54.patch | git apply && \
     sed -i 's/OVN/ovn/g' debian/changelog && \
     rm -rf .git && \
     ./boot.sh && \

diff --git a/dist/images/install.sh b/dist/images/install.sh
@@ -13,7 +13,6 @@ HW_OFFLOAD=${HW_OFFLOAD:-false}
 ENABLE_LB=${ENABLE_LB:-true}
 ENABLE_NP=${ENABLE_NP:-true}
 ENABLE_EXTERNAL_VPC=${ENABLE_EXTERNAL_VPC:-true}
-MULTICAST_PRIVILEGED=${MULTICAST_PRIVILEGED:-false}
 # The nic to support container network can be a nic name or a group of regex
 # separated by comma, if empty will use the nic that the default route use
 IFACE=${IFACE:-}
@@ -1886,7 +1885,6 @@ spec:
           - --enable-lb=$ENABLE_LB
           - --enable-np=$ENABLE_NP
           - --enable-external-vpc=$ENABLE_EXTERNAL_VPC
-          - --multicast-privileged=$MULTICAST_PRIVILEGED
           - --logtostderr=false
           - --alsologtostderr=true
           - --log_file=/var/log/kube-ovn/kube-ovn-controller.log

diff --git a/pkg/controller/config.go b/pkg/controller/config.go
@@ -69,8 +69,6 @@ type Configuration struct {
 	EnableLb          bool
 	EnableNP          bool
 	EnableExternalVpc bool
-
-	MulticastPrivileged bool
 }
 
 // ParseFlags parses cmd args then init kubeclient and conf
@@ -113,8 +111,6 @@ func ParseFlags() (*Configuration, error) {
 		argEnableLb             = pflag.Bool("enable-lb", true, "Enable load balancer")
 		argEnableNP             = pflag.Bool("enable-np", true, "Enable network policy support")
 		argEnableExternalVpc    = pflag.Bool("enable-external-vpc", true, "Enable external vpc support")
-
-		argMulticastPrivileged = pflag.Bool("multicast-privileged", false, "Move broadcast/multicast flows to table ls_in_pre_lb in logical switches' ingress pipeline to improve broadcast/multicast performace (default false)")
 	)
 
 	klogFlags := flag.NewFlagSet("klog", flag.ExitOnError)
@@ -168,7 +164,6 @@ func ParseFlags() (*Configuration, error) {
 		EnableLb:                      *argEnableLb,
 		EnableNP:                      *argEnableNP,
 		EnableExternalVpc:             *argEnableExternalVpc,
-		MulticastPrivileged:           *argMulticastPrivileged,
 	}
 
 	if config.NetworkType == util.NetworkTypeVlan && config.DefaultHostInterface == "" {

diff --git a/pkg/controller/init.go b/pkg/controller/init.go
@@ -18,10 +18,6 @@ import (
 )
 
 func (c *Controller) InitOVN() error {
-	if err := c.ovnClient.SetMulticastPrivileged(c.config.MulticastPrivileged); err != nil {
-		return err
-	}
-
 	if err := c.initClusterRouter(); err != nil {
 		klog.Errorf("init cluster router failed: %v", err)
 		return err

diff --git a/pkg/ovs/ovn-nbctl.go b/pkg/ovs/ovn-nbctl.go
@@ -67,13 +67,6 @@ func (c Client) SetUseCtInvMatch() error {
 	return nil
 }
 
-func (c Client) SetMulticastPrivileged(enabled bool) error {
-	if _, err := c.ovnNbCommand("set", "NB_Global", ".", fmt.Sprintf("options:mcast_privileged=%v", enabled)); err != nil {
-		return fmt.Errorf("failed to set NB_Global option mcast_privileged to %v: %v", enabled, err)
-	}
-	return nil
-}
-
 func (c Client) SetICAutoRoute(enable bool, blackList []string) error {
 	if enable {
 		if _, err := c.ovnNbCommand("set", "NB_Global", ".", "options:ic-route-adv=true", "options:ic-route-learn=true", fmt.Sprintf("options:ic-route-blacklist=%s", strings.Join(blackList, ","))); err != nil {

diff --git a/yamls/kube-ovn-ipv6.yaml b/yamls/kube-ovn-ipv6.yaml
@@ -57,8 +57,6 @@ spec:
             - --pod-nic-type=veth-pair
             - --enable-lb=true
             - --enable-np=true
-            - --enable-external-vpc=true
-            - --multicast-privileged=false
           env:
             - name: ENABLE_SSL
               value: "false"

diff --git a/yamls/kube-ovn.yaml b/yamls/kube-ovn.yaml
@@ -49,7 +49,6 @@ spec:
             - --default-logical-gateway=false
             - --default-exclude-ips=
             - --node-switch-cidr=100.64.0.0/16
-            - --node-switch-gateway=100.64.0.1
             - --service-cluster-ip-range=10.96.0.0/12
             - --network-type=geneve
             - --default-interface-name=
@@ -58,7 +57,6 @@ spec:
             - --enable-lb=true
             - --enable-np=true
             - --enable-external-vpc=true
-            - --multicast-privileged=false
           env:
             - name: ENABLE_SSL
               value: "false"