support k8s host vm vip type

Signed-off-by: zbb88888 <[email protected]>

Author: zbb88888

pkg/controller/gc.go

@@ -368,6 +368,18 @@ func (c *Controller) markAndCleanLSP() error {
 	// The lsp for vm pod should not be deleted if vm still exists
 	ipMap.Add(c.getVMLsps()...)
 
+	vips, err := c.virtualIpsLister.List(labels.Everything())
+	if err != nil {
+		klog.Errorf("failed to list virtual ip, %v", err)
+		return err
+	}
+	vipsMap := strset.NewWithSize(len(vips))
+	for _, vip := range vips {
+		if vip.Spec.Type != "" {
+			portName := ovs.PodNameToPortName(vip.Name, vip.Spec.Namespace, util.OvnProvider)
+			vipsMap.Add(portName)
+		}
+	}
 	lsps, err := c.OVNNbClient.ListNormalLogicalSwitchPorts(c.config.EnableExternalVpc, nil)
 	if err != nil {
 		klog.Errorf("failed to list logical switch port, %v", err)
@@ -381,9 +393,8 @@ func (c *Controller) markAndCleanLSP() error {
 		if ipMap.Has(lsp.Name) {
 			continue
 		}
-
-		if lsp.Options != nil && lsp.Options["arp_proxy"] == "true" {
-			// arp_proxy lsp is a type of vip crd which should not gc
+		if vipsMap.Has(lsp.Name) {
+			// skip gc lsp for k8s host network vm pod or switch lb rule
 			continue
 		}
 		if !lastNoPodLSP.Has(lsp.Name) {

pkg/controller/ip.go

@@ -344,7 +344,7 @@ func (c *Controller) acquireIPAddress(subnetName, name, nicName string) (string,
 	}
 }
 
-func (c *Controller) acquireStaticIPAddress(subnetName, name, nicName, ip string) (string, string, string, error) {
+func (c *Controller) acquireStaticIPAddress(subnetName, name, nicName, ip string, macPointer *string) (string, string, string, error) {
 	checkConflict := true
 	var v4ip, v6ip, mac string
 	var err error
@@ -354,7 +354,7 @@ func (c *Controller) acquireStaticIPAddress(subnetName, name, nicName, ip string
 		}
 	}
 
-	if v4ip, v6ip, mac, err = c.ipam.GetStaticAddress(name, nicName, ip, nil, subnetName, checkConflict); err != nil {
+	if v4ip, v6ip, mac, err = c.ipam.GetStaticAddress(name, nicName, ip, macPointer, subnetName, checkConflict); err != nil {
 		klog.Errorf("failed to get static virtual ip '%s', mac '%s', subnet '%s', %v", ip, mac, subnetName, err)
 		return "", "", "", err
 	}

pkg/controller/ovn_eip.go

@@ -92,7 +92,7 @@ func (c *Controller) handleAddOvnEip(key string) error {
 	}
 	portName := cachedEip.Name
 	if cachedEip.Spec.V4Ip != "" {
-		v4ip, v6ip, mac, err = c.acquireStaticIPAddress(subnet.Name, cachedEip.Name, portName, cachedEip.Spec.V4Ip)
+		v4ip, v6ip, mac, err = c.acquireStaticIPAddress(subnet.Name, cachedEip.Name, portName, cachedEip.Spec.V4Ip, nil)
 	} else {
 		// random allocate
 		v4ip, v6ip, mac, err = c.acquireIPAddress(subnet.Name, cachedEip.Name, portName)

pkg/controller/subnet.go

@@ -1921,7 +1921,7 @@ func (c *Controller) acquireU2OIP(subnet *kubeovnv1.Subnet, u2oInterconnName, u2
 			klog.Infof("release underlay to overlay interconnection ip address %s for subnet %s", subnet.Status.U2OInterconnectionIP, subnet.Name)
 			c.ipam.ReleaseAddressByPod(u2oInterconnName, subnet.Name)
 		}
-		v4ip, v6ip, mac, err = c.acquireStaticIPAddress(subnet.Name, u2oInterconnName, u2oInterconnLrpName, subnet.Spec.U2OInterconnectionIP)
+		v4ip, v6ip, mac, err = c.acquireStaticIPAddress(subnet.Name, u2oInterconnName, u2oInterconnLrpName, subnet.Spec.U2OInterconnectionIP, nil)
 		if err != nil {
 			klog.Errorf("failed to acquire static underlay to overlay interconnection ip address for subnet %s, %v", subnet.Name, err)
 			return "", "", "", err

pkg/controller/vip.go

@@ -87,14 +87,15 @@ func (c *Controller) handleAddVirtualIP(key string) error {
 		klog.Error(err)
 		return err
 	}
+	var macPointer *string
 	ipStr := util.GetStringIP(sourceV4Ip, sourceV6Ip)
-	if ipStr != "" {
-		v4ip, v6ip, mac, err = c.acquireStaticIPAddress(subnet.Name, vip.Name, portName, ipStr)
+	if ipStr != "" && vip.Spec.MacAddress != "" {
+		macPointer = &vip.Spec.MacAddress
+		v4ip, v6ip, mac, err = c.acquireStaticIPAddress(subnet.Name, vip.Name, portName, ipStr, macPointer)
 	} else {
 		// Random allocate
 		v4ip, v6ip, mac, err = c.acquireIPAddress(subnet.Name, vip.Name, portName)
 	}
-
 	if err != nil {
 		klog.Error(err)
 		return err
@@ -137,10 +138,25 @@ func (c *Controller) handleAddVirtualIP(key string) error {
 		parentV6ip = vip.Spec.ParentV6ip
 		parentMac = vip.Spec.ParentMac
 	}
+	if vip.Spec.Type == util.KubeHostVMVip {
+		// k8s host network pod vm use vip for its nic ip
+		klog.Infof("create lsp for host network pod vm nic ip %s", vip.Name)
+		ipStr := util.GetStringIP(v4ip, v6ip)
+		if err := c.OVNNbClient.CreateLogicalSwitchPort(subnet.Name, portName, ipStr, mac, vip.Name, vip.Spec.Namespace, false, "", "", false, nil, subnet.Spec.Vpc); err != nil {
+			err = fmt.Errorf("failed to create lsp %s: %w", portName, err)
+			klog.Error(err)
+			return err
+		}
+	}
 	if err = c.createOrUpdateVipCR(key, vip.Spec.Namespace, subnet.Name, v4ip, v6ip, mac, parentV4ip, parentV6ip, parentMac); err != nil {
 		klog.Errorf("failed to create or update vip '%s', %v", vip.Name, err)
 		return err
 	}
+	if vip.Spec.Type == util.KubeHostVMVip {
+		// vm use the vip as its real ip
+		klog.Infof("created host network pod vm ip %s", key)
+		return nil
+	}
 	if err := c.handleUpdateVirtualParents(key); err != nil {
 		err := fmt.Errorf("error syncing virtual parents for vip '%s': %s", key, err.Error())
 		klog.Error(err)
@@ -214,14 +230,14 @@ func (c *Controller) handleUpdateVirtualIP(key string) error {
 func (c *Controller) handleDelVirtualIP(vip *kubeovnv1.Vip) error {
 	klog.Infof("handle delete vip %s", vip.Name)
 	// TODO:// clean vip in its parent port aap list
-	if vip.Spec.Type == util.SwitchLBRuleVip {
+	if vip.Spec.Type != "" {
 		subnet, err := c.subnetsLister.Get(vip.Spec.Subnet)
 		if err != nil {
 			klog.Errorf("failed to get subnet %s: %v", vip.Spec.Subnet, err)
 			return err
 		}
 		portName := ovs.PodNameToPortName(vip.Name, vip.Spec.Namespace, subnet.Spec.Provider)
-		klog.Infof("delete vip arp proxy lsp %s", portName)
+		klog.Infof("delete vip lsp %s", portName)
 		if err := c.OVNNbClient.DeleteLogicalSwitchPort(portName); err != nil {
 			err = fmt.Errorf("failed to delete lsp %s: %w", vip.Name, err)
 			klog.Error(err)
@@ -247,6 +263,11 @@ func (c *Controller) handleUpdateVirtualParents(key string) error {
 		klog.Error(err)
 		return err
 	}
+	if cachedVip.Spec.Type == util.KubeHostVMVip {
+		// vm use the vip as its real ip
+		klog.Infof("created host network pod vm ip %s", key)
+		return nil
+	}
 	// only pods in the same namespace as vip are allowed to use aap
 	if (cachedVip.Status.V4ip == "" && cachedVip.Status.V6ip == "") || cachedVip.Spec.Namespace == "" {
 		return nil

pkg/util/const.go

@@ -44,6 +44,7 @@ const (
 
 	SwitchLBRuleVipsAnnotation = "ovn.kubernetes.io/switch_lb_vip"
 	SwitchLBRuleVip            = "switch_lb_vip"
+	KubeHostVMVip              = "kube_host_vm_vip"
 	SwitchLBRuleSubnet         = "switch_lb_subnet"
 
 	LogicalRouterAnnotation = "ovn.kubernetes.io/logical_router"