refactor: add unknown config to lsp (#2076)

* reflactor: add unkown config to lsp * fix merge error
kubeovn · Nov 24, 2022 · c97b1f1 · c97b1f1
1 parent d1bd047
commit c97b1f1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -256,7 +256,7 @@ func (c *Controller) handleAddNode(key string) error {
 	}
 
 	ipStr := util.GetStringIP(v4IP, v6IP)
-	if err := c.ovnLegacyClient.CreatePort(c.config.NodeSwitch, portName, ipStr, mac, "", "", false, "", "", false); err != nil {
+	if err := c.ovnLegacyClient.CreatePort(c.config.NodeSwitch, portName, ipStr, mac, "", "", false, "", "", false, false); err != nil {
 		return err
 	}
 

diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -545,7 +545,8 @@ func (c *Controller) handleAddPod(key string) error {
 			}
 
 			portName := ovs.PodNameToPortName(podName, namespace, podNet.ProviderName)
-			if err := c.ovnLegacyClient.CreatePort(subnet.Name, portName, ipStr, mac, podName, pod.Namespace, portSecurity, securityGroupAnnotation, vips, podNet.AllowLiveMigration); err != nil {
+			hasUnknown := pod.Annotations[fmt.Sprintf(util.Layer2ForwardAnnotationTemplate, podNet.ProviderName)] == "true"
+			if err := c.ovnLegacyClient.CreatePort(subnet.Name, portName, ipStr, mac, podName, pod.Namespace, portSecurity, securityGroupAnnotation, vips, podNet.AllowLiveMigration, hasUnknown); err != nil {
 				c.recorder.Eventf(pod, v1.EventTypeWarning, "CreateOVNPortFailed", err.Error())
 				return err
 			}

diff --git a/pkg/ovs/ovn-nbctl-legacy.go b/pkg/ovs/ovn-nbctl-legacy.go
@@ -184,7 +184,7 @@ func (c LegacyClient) SetPortSecurity(portSecurity bool, port, mac, ipStr, vips
 }
 
 // CreatePort create logical switch port in ovn
-func (c LegacyClient) CreatePort(ls, port, ip, mac, pod, namespace string, portSecurity bool, securityGroups string, vips string, liveMigration bool) error {
+func (c LegacyClient) CreatePort(ls, port, ip, mac, pod, namespace string, portSecurity bool, securityGroups string, vips string, liveMigration bool, hasUnknown bool) error {
 	var ovnCommand []string
 	var addresses []string
 	addresses = append(addresses, mac)
@@ -217,6 +217,10 @@ func (c LegacyClient) CreatePort(ls, port, ip, mac, pod, namespace string, portS
 		// set mac and ip
 		ovnCommand = append(ovnCommand,
 			"--", "lsp-set-addresses", port, strings.Join(addresses, " "))
+
+		if hasUnknown {
+			ovnCommand = append(ovnCommand, "unknown")
+		}
 	}
 
 	if portSecurity {

diff --git a/pkg/util/const.go b/pkg/util/const.go
@@ -30,10 +30,11 @@ const (
 	LogicalRouterAnnotation = "ovn.kubernetes.io/logical_router"
 	VpcAnnotation           = "ovn.kubernetes.io/vpc"
 
-	PortSecurityAnnotationTemplate = "%s.kubernetes.io/port_security"
-	PortVipAnnotationTemplate      = "%s.kubernetes.io/port_vips"
-	PortSecurityAnnotation         = "ovn.kubernetes.io/port_security"
-	NorthGatewayAnnotation         = "ovn.kubernetes.io/north_gateway"
+	Layer2ForwardAnnotationTemplate = "%s.kubernetes.io/layer2_forward"
+	PortSecurityAnnotationTemplate  = "%s.kubernetes.io/port_security"
+	PortVipAnnotationTemplate       = "%s.kubernetes.io/port_vips"
+	PortSecurityAnnotation          = "ovn.kubernetes.io/port_security"
+	NorthGatewayAnnotation          = "ovn.kubernetes.io/north_gateway"
 
 	AllocatedAnnotationSuffix       = ".kubernetes.io/allocated"
 	AllocatedAnnotationTemplate     = "%s.kubernetes.io/allocated"