support alloc static ip from any subnet after ns supports multi subnets

kubeovn · Mar 31, 2022 · f0bb276 · f0bb276
1 parent 7a67a21
commit f0bb276
Showing 1 changed file with 95 additions and 18 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -452,8 +452,8 @@ func (c *Controller) handleAddPod(key string) error {
 
 	// Avoid create lsp for already running pod in ovn-nb when controller restart
 	for _, podNet := range needAllocateSubnets(pod, podNets) {
-		subnet := podNet.Subnet
-		v4IP, v6IP, mac, err := c.acquireAddress(pod, podNet)
+		// the subnet may changed when alloc static ip from the latter subnet after ns supports multi subnets
+		v4IP, v6IP, mac, subnet, err := c.acquireAddress(pod, podNet)
 		if err != nil {
 			c.recorder.Eventf(pod, v1.EventTypeWarning, "AcquireAddressFailed", err.Error())
 			return err
@@ -1107,7 +1107,7 @@ func (c *Controller) validatePodIP(podName, subnetName, ipv4, ipv6 string) (bool
 	return true, true, nil
 }
 
-func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, string, string, error) {
+func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, string, string, *kubeovnv1.Subnet, error) {
 	podName := c.getNameByPod(pod)
 	key := fmt.Sprintf("%s/%s", pod.Namespace, podName)
 	macStr := pod.Annotations[fmt.Sprintf(util.MacAddressAnnotationTemplate, podNet.ProviderName)]
@@ -1119,15 +1119,15 @@ func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, st
 		for {
 			ipv4, ipv6, mac, err := c.ipam.GetRandomAddress(key, podNet.Subnet.Name, skippedAddrs)
 			if err != nil {
-				return "", "", "", err
+				return "", "", "", podNet.Subnet, err
 			}
 
 			ipv4OK, ipv6OK, err := c.validatePodIP(pod.Name, podNet.Subnet.Name, ipv4, ipv6)
 			if err != nil {
-				return "", "", "", err
+				return "", "", "", podNet.Subnet, err
 			}
 			if ipv4OK && ipv6OK {
-				return ipv4, ipv6, mac, nil
+				return ipv4, ipv6, mac, podNet.Subnet, nil
 			}
 
 			if !ipv4OK {
@@ -1139,10 +1139,32 @@ func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, st
 		}
 	}
 
+	// The static ip can be assigned from any subnet after ns supports multi subnets
+	nsNets, _ := c.getNsAvailableSubnets(pod)
+	found := false
+	for _, nsNet := range nsNets {
+		if nsNet.Subnet.Name == podNet.Subnet.Name {
+			found = true
+			break
+		}
+	}
+	if !found {
+		nsNets = append(nsNets, podNet)
+	}
+	var v4IP, v6IP, mac string
+	var err error
+
 	// Static allocate
 	if pod.Annotations[fmt.Sprintf(util.IpAddressAnnotationTemplate, podNet.ProviderName)] != "" {
 		ipStr := pod.Annotations[fmt.Sprintf(util.IpAddressAnnotationTemplate, podNet.ProviderName)]
-		return c.acquireStaticAddress(key, ipStr, macStr, podNet.Subnet.Name)
+
+		for _, net := range nsNets {
+			v4IP, v6IP, mac, err = c.acquireStaticAddress(key, ipStr, macStr, net.Subnet.Name)
+			if err == nil {
+				return v4IP, v6IP, mac, net.Subnet, nil
+			}
+		}
+		return v4IP, v6IP, mac, podNet.Subnet, err
 	}
 
 	// IPPool allocate
@@ -1152,27 +1174,36 @@ func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, st
 	}
 
 	if ok, _ := isStatefulSetPod(pod); !ok {
-		for _, staticIP := range ipPool {
-			if c.ipam.IsIPAssignedToPod(staticIP, podNet.Subnet.Name, key) {
-				klog.Errorf("static address %s for %s has been assigned", staticIP, key)
-				continue
-			}
-			if v4IP, v6IP, mac, err := c.acquireStaticAddress(key, staticIP, macStr, podNet.Subnet.Name); err == nil {
-				return v4IP, v6IP, mac, nil
-			} else {
-				klog.Errorf("acquire address %s for %s failed, %v", staticIP, key, err)
+		for _, net := range nsNets {
+			for _, staticIP := range ipPool {
+				if c.ipam.IsIPAssignedToPod(staticIP, net.Subnet.Name, key) {
+					klog.Errorf("static address %s for %s has been assigned", staticIP, key)
+					continue
+				}
+
+				v4IP, v6IP, mac, err = c.acquireStaticAddress(key, staticIP, macStr, net.Subnet.Name)
+				if err == nil {
+					return v4IP, v6IP, mac, net.Subnet, nil
+				}
 			}
 		}
+		klog.Errorf("acquire address %s for %s failed, %v", pod.Annotations[fmt.Sprintf(util.IpPoolAnnotationTemplate, podNet.ProviderName)], key, err)
 	} else {
 		numIndex := len(strings.Split(pod.Name, "-")) - 1
 		numStr := strings.Split(pod.Name, "-")[numIndex]
 		index, _ := strconv.Atoi(numStr)
 		if index < len(ipPool) {
-			return c.acquireStaticAddress(key, ipPool[index], macStr, podNet.Subnet.Name)
+			for _, net := range nsNets {
+				v4IP, v6IP, mac, err = c.acquireStaticAddress(key, ipPool[index], macStr, net.Subnet.Name)
+				if err == nil {
+					return v4IP, v6IP, mac, net.Subnet, nil
+				}
+			}
+			klog.Errorf("acquire address %s for %s failed, %v", ipPool[index], key, err)
 		}
 	}
 	klog.Errorf("alloc address for %s failed, return NoAvailableAddress", key)
-	return "", "", "", ipam.NoAvailableError
+	return "", "", "", podNet.Subnet, ipam.NoAvailableError
 }
 
 func generatePatchPayload(annotations map[string]string, op string) []byte {
@@ -1300,3 +1331,49 @@ func (c *Controller) getNameByPod(pod *v1.Pod) string {
 	}
 	return podName
 }
+
+func (c *Controller) getNsAvailableSubnets(pod *v1.Pod) ([]*kubeovnNet, error) {
+	var result []*kubeovnNet
+
+	ns, err := c.namespacesLister.Get(pod.Namespace)
+	if err != nil {
+		klog.Errorf("failed to get namespace %s, %v", pod.Namespace, err)
+		return nil, err
+	}
+	if ns.Annotations == nil {
+		return nil, nil
+	}
+
+	subnetNames := ns.Annotations[util.LogicalSwitchAnnotation]
+	for _, subnetName := range strings.Split(subnetNames, ",") {
+		if subnetName == "" {
+			continue
+		}
+		subnet, err := c.subnetsLister.Get(subnetName)
+		if err != nil {
+			klog.Errorf("failed to get subnet %v", err)
+			return nil, err
+		}
+
+		switch subnet.Spec.Protocol {
+		case kubeovnv1.ProtocolIPv4:
+			fallthrough
+		case kubeovnv1.ProtocolDual:
+			if subnet.Status.V4AvailableIPs == 0 {
+				continue
+			}
+		case kubeovnv1.ProtocolIPv6:
+			if subnet.Status.V6AvailableIPs == 0 {
+				continue
+			}
+		}
+
+		result = append(result, &kubeovnNet{
+			Type:         providerTypeOriginal,
+			ProviderName: subnet.Spec.Provider,
+			Subnet:       subnet,
+		})
+	}
+
+	return result, nil
+}