split ippoolname and old ippool

kubeovn · Jul 19, 2023 · dc7f01c · dc7f01c
1 parent ed58b21
commit dc7f01c
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 12 deletions.
diff --git a/pkg/controller/ippool.go b/pkg/controller/ippool.go
@@ -218,7 +218,7 @@ func (c *Controller) handleDeleteIPPool(ippool *kubeovnv1.IPPool) error {
 		if len(ns.Annotations) == 0 {
 			continue
 		}
-		if ns.Annotations[util.IpPoolAnnotation] == ippool.Name {
+		if ns.Annotations[util.IpPoolNameAnnotation] == ippool.Name {
 			c.enqueueAddNamespace(ns)
 		}
 	}

diff --git a/pkg/controller/namespace.go b/pkg/controller/namespace.go
@@ -192,7 +192,7 @@ func (c *Controller) handleAddNamespace(key string) error {
 		if namespace.Annotations[util.LogicalSwitchAnnotation] == strings.Join(lss, ",") &&
 			namespace.Annotations[util.CidrAnnotation] == strings.Join(cidrs, ";") &&
 			namespace.Annotations[util.ExcludeIpsAnnotation] == strings.Join(excludeIps, ";") &&
-			namespace.Annotations[util.IpPoolAnnotation] == ippool {
+			namespace.Annotations[util.IpPoolNameAnnotation] == ippool {
 			return nil
 		}
 	}
@@ -201,9 +201,9 @@ func (c *Controller) handleAddNamespace(key string) error {
 	namespace.Annotations[util.ExcludeIpsAnnotation] = strings.Join(excludeIps, ";")
 
 	if ippool == "" {
-		delete(namespace.Annotations, util.IpPoolAnnotation)
+		delete(namespace.Annotations, util.IpPoolNameAnnotation)
 	} else {
-		namespace.Annotations[util.IpPoolAnnotation] = ippool
+		namespace.Annotations[util.IpPoolNameAnnotation] = ippool
 	}
 
 	patch, err := util.GenerateStrategicMergePatchPayload(cachedNs, namespace)

diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -1482,6 +1482,7 @@ func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, st
 		*macStr = ""
 	}
 
+	ipPoolNameStr := pod.Annotations[fmt.Sprintf(util.IpPoolNameAnnotationTemplate, podNet.ProviderName)]
 	ippoolStr := pod.Annotations[fmt.Sprintf(util.IpPoolAnnotationTemplate, podNet.ProviderName)]
 	if ippoolStr == "" {
 		ns, err := c.namespacesLister.Get(pod.Namespace)
@@ -1490,7 +1491,7 @@ func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, st
 			return "", "", "", podNet.Subnet, err
 		}
 		if len(ns.Annotations) != 0 {
-			ippoolStr = ns.Annotations[util.IpPoolAnnotation]
+			ippoolStr = ns.Annotations[util.IpPoolNameAnnotation]
 		}
 	}
 
@@ -1544,21 +1545,32 @@ func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, st
 
 	// IPPool allocate
 	if ippoolStr != "" {
-		var ipPool []string
+		var ipPool, ipPoolNames []string
 		if strings.ContainsRune(ippoolStr, ';') {
 			ipPool = strings.Split(ippoolStr, ";")
 		} else {
-			ipPool = strings.Split(ippoolStr, ",")
+			if podNet.Subnet.Spec.Protocol == kubeovnv1.ProtocolDual {
+				klog.Infof("sts pod in dual stack subnet use ip pool: %s", ippoolStr)
+				ipPool = strings.Split(ippoolStr, ";")
+			} else {
+				ipPool = strings.Split(ippoolStr, ",")
+			}
+		}
+		if ipPoolNameStr != "" {
+			ipPoolNames = strings.Split(ipPoolNameStr, ",")
 		}
 		for i, ip := range ipPool {
 			ipPool[i] = strings.TrimSpace(ip)
 		}
-
-		if len(ipPool) == 1 && net.ParseIP(ipPool[0]) == nil {
+		for i, name := range ipPoolNames {
+			ipPoolNames[i] = strings.TrimSpace(name)
+		}
+		if len(ipPoolNames) == 1 && ipPoolNames[0] != "" {
+			klog.Infof("random allocate ip by ip pool %s from subnet %s", ipPoolNames[0], podNet.Subnet.Name)
 			var skippedAddrs []string
 			for {
 				portName := ovs.PodNameToPortName(podName, pod.Namespace, podNet.ProviderName)
-				ipv4, ipv6, mac, err := c.ipam.GetRandomAddress(key, portName, macStr, podNet.Subnet.Name, ipPool[0], skippedAddrs, !podNet.AllowLiveMigration)
+				ipv4, ipv6, mac, err := c.ipam.GetRandomAddress(key, portName, macStr, podNet.Subnet.Name, ipPoolNames[0], skippedAddrs, !podNet.AllowLiveMigration)
 				if err != nil {
 					return "", "", "", podNet.Subnet, err
 				}

diff --git a/pkg/util/const.go b/pkg/util/const.go
@@ -13,6 +13,7 @@ const (
 	CidrAnnotation       = "ovn.kubernetes.io/cidr"
 	GatewayAnnotation    = "ovn.kubernetes.io/gateway"
 	IpPoolAnnotation     = "ovn.kubernetes.io/ip_pool"
+	IpPoolNameAnnotation = "ovn.kubernetes.io/ip_pool_name"
 	BgpAnnotation        = "ovn.kubernetes.io/bgp"
 	SnatAnnotation       = "ovn.kubernetes.io/snat"
 	EipAnnotation        = "ovn.kubernetes.io/eip"
@@ -73,6 +74,7 @@ const (
 	CidrAnnotationTemplate          = "%s.kubernetes.io/cidr"
 	GatewayAnnotationTemplate       = "%s.kubernetes.io/gateway"
 	IpPoolAnnotationTemplate        = "%s.kubernetes.io/ip_pool"
+	IpPoolNameAnnotationTemplate    = "%s.kubernetes.io/ip_pool_name"
 	LogicalSwitchAnnotationTemplate = "%s.kubernetes.io/logical_switch"
 	LogicalRouterAnnotationTemplate = "%s.kubernetes.io/logical_router"
 	VlanIdAnnotationTemplate        = "%s.kubernetes.io/vlan_id"

diff --git a/test/e2e/kube-ovn/ipam/ipam.go b/test/e2e/kube-ovn/ipam/ipam.go
@@ -452,7 +452,7 @@ var _ = framework.Describe("[group:ipam]", func() {
 		ginkgo.By("Creating deployment " + deployName + " within ippool " + ippoolName)
 		replicas := 3
 		labels := map[string]string{"app": deployName}
-		annotations := map[string]string{util.IpPoolAnnotation: ippoolName}
+		annotations := map[string]string{util.IpPoolNameAnnotation: ippoolName}
 		deploy := framework.MakeDeployment(deployName, int32(replicas), labels, annotations, "pause", framework.PauseImage, "")
 		deploy = deployClient.CreateSync(deploy)
 
@@ -530,7 +530,7 @@ var _ = framework.Describe("[group:ipam]", func() {
 		ginkgo.By("Validating namespace annotations")
 		framework.WaitUntil(2*time.Second, 30*time.Second, func(_ context.Context) (bool, error) {
 			ns := nsClient.Get(namespaceName)
-			return len(ns.Annotations) != 0 && ns.Annotations[util.IpPoolAnnotation] == ippoolName, nil
+			return len(ns.Annotations) != 0 && ns.Annotations[util.IpPoolNameAnnotation] == ippoolName, nil
 		}, "")
 
 		ginkgo.By("Patching deployment " + deployName)