support vip dual stack

Signed-off-by: zcq98 <[email protected]>
kubeovn · Jan 12, 2024 · 7e3dc7c · 7e3dc7c
1 parent 9a77310
commit 7e3dc7c
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 17 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -2021,7 +2021,7 @@ func (c *Controller) getVirtualIPs(pod *v1.Pod, podNets []*kubeovnNet) map[strin
 				klog.Errorf("failed to get vip %s, %v", vipName, err)
 				continue
 			}
-			if vip.Spec.Namespace != pod.Namespace || vip.Status.V4ip == "" {
+			if vip.Spec.Namespace != pod.Namespace || (vip.Status.V4ip == "" && vip.Status.V6ip == "") {
 				continue
 			}
 			subnet, err := c.subnetsLister.Get(vip.Spec.Subnet)
@@ -2030,25 +2030,38 @@ func (c *Controller) getVirtualIPs(pod *v1.Pod, podNets []*kubeovnNet) map[strin
 				continue
 			}
 			key := fmt.Sprintf("%s.%s", subnet.Name, subnet.Spec.Provider)
-			if vips, exists := vipsMap[key]; exists {
-				vipsMap[key] = strings.Join([]string{vips, vip.Status.V4ip}, ",")
+			vips := vipsMap[key]
+			if vips == "" {
+				vips = util.GetStringIP(vip.Status.V4ip, vip.Status.V6ip)
 			} else {
-				vipsMap[key] = vip.Status.V4ip
+				if util.IsValidIP(vip.Status.V4ip) && !strings.Contains(vips, vip.Status.V4ip) {
+					vips = strings.Join([]string{vips, vip.Status.V4ip}, ",")
+				}
+				if util.IsValidIP(vip.Status.V6ip) && !strings.Contains(vips, vip.Status.V6ip) {
+					vips = strings.Join([]string{vips, vip.Status.V6ip}, ",")
+				}
 			}
+			vipsMap[key] = vips
 		}
 	}
 
 	for _, podNet := range podNets {
-		key := fmt.Sprintf("%s.%s", podNet.Subnet.Name, podNet.ProviderName)
-		vip := pod.Annotations[fmt.Sprintf(util.PortVipAnnotationTemplate, podNet.ProviderName)]
-		if vip == "" {
+		vipStr := pod.Annotations[fmt.Sprintf(util.PortVipAnnotationTemplate, podNet.ProviderName)]
+		if vipStr == "" {
 			continue
 		}
-		if vips, exists := vipsMap[key]; exists {
-			vipsMap[key] = strings.Join([]string{vips, vip}, ",")
-		} else {
-			vipsMap[key] = vip
+		key := fmt.Sprintf("%s.%s", podNet.Subnet.Name, podNet.ProviderName)
+		vips := vipsMap[key]
+		for _, vip := range strings.Split(vipStr, ",") {
+			if util.IsValidIP(vip) && !strings.Contains(vips, vip) {
+				if vips == "" {
+					vips = vip
+				} else {
+					vips = strings.Join([]string{vips, vip}, ",")
+				}
+			}
 		}
+		vipsMap[key] = vips
 	}
 	return vipsMap
 }
diff --git a/pkg/controller/vip.go b/pkg/controller/vip.go
@@ -46,7 +46,8 @@ func (c *Controller) enqueueUpdateVirtualIP(oldObj, newObj interface{}) {
 		oldVip.Spec.MacAddress != newVip.Spec.MacAddress ||
 		oldVip.Spec.ParentMac != newVip.Spec.ParentMac ||
 		oldVip.Spec.ParentV4ip != newVip.Spec.ParentV4ip ||
-		oldVip.Spec.V4ip != newVip.Spec.V4ip {
+		oldVip.Spec.V4ip != newVip.Spec.V4ip ||
+		oldVip.Spec.V6ip != newVip.Spec.V6ip {
 		klog.Infof("enqueue update vip %s", key)
 		c.updateVirtualIPQueue.Add(key)
 	}
@@ -216,7 +217,7 @@ func (c *Controller) handleAddVirtualIP(key string) error {
 	}
 	klog.V(3).Infof("handle add vip %s", key)
 	vip := cachedVip.DeepCopy()
-	var sourceV4Ip, v4ip, v6ip, mac, subnetName string
+	var sourceV4Ip, sourceV6Ip, v4ip, v6ip, mac, subnetName string
 	subnetName = vip.Spec.Subnet
 	if subnetName == "" {
 		return fmt.Errorf("failed to create vip '%s', subnet should be set", key)
@@ -228,12 +229,15 @@ func (c *Controller) handleAddVirtualIP(key string) error {
 	}
 	portName := ovs.PodNameToPortName(vip.Name, vip.Spec.Namespace, subnet.Spec.Provider)
 	sourceV4Ip = vip.Spec.V4ip
-	if sourceV4Ip != "" {
-		v4ip, v6ip, mac, err = c.acquireStaticIPAddress(subnet.Name, vip.Name, portName, sourceV4Ip)
+	sourceV6Ip = vip.Spec.V6ip
+	ipStr := util.GetStringIP(sourceV4Ip, sourceV6Ip)
+	if ipStr != "" {
+		v4ip, v6ip, mac, err = c.acquireStaticIPAddress(subnet.Name, vip.Name, portName, ipStr)
 	} else {
 		// Random allocate
 		v4ip, v6ip, mac, err = c.acquireIPAddress(subnet.Name, vip.Name, portName)
 	}
+
 	if err != nil {
 		klog.Error(err)
 		return err
@@ -420,11 +424,12 @@ func (c *Controller) handleUpdateVirtualParents(key string) error {
 		return err
 	}
 	// only pods in the same namespace as vip are allowed to use aap
-	if cachedVip.Status.V4ip == "" || cachedVip.Spec.Namespace == "" {
+	if (cachedVip.Status.V4ip == "" && cachedVip.Status.V6ip == "") || cachedVip.Spec.Namespace == "" {
 		return nil
 	}
 	// add new virtual port if not exist
-	if err = c.OVNNbClient.CreateVirtualLogicalSwitchPort(cachedVip.Name, cachedVip.Spec.Subnet, cachedVip.Status.V4ip); err != nil {
+	ipStr := util.GetStringIP(cachedVip.Status.V4ip, cachedVip.Status.V6ip)
+	if err = c.OVNNbClient.CreateVirtualLogicalSwitchPort(cachedVip.Name, cachedVip.Spec.Subnet, ipStr); err != nil {
 		klog.Errorf("create virtual port with vip %s from logical switch %s: %v", cachedVip.Name, cachedVip.Spec.Subnet, err)
 		return err
 	}