refactor function name isIPAssignedToPod to isIPAssignedToOtherPod (#…

…2096) * refacor funcname isIPAssignedToPod to isIPAssignedToOtherPod * report assigned pod to log * turn the order of return value * refactor
kubeovn · Dec 2, 2022 · c42dae3 · c42dae3
1 parent c52f384
commit c42dae3
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -1297,8 +1297,8 @@ func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, st
 		for _, net := range nsNets {
 			for _, staticIPs := range ipPool {
 				for _, staticIP := range strings.Split(staticIPs, ",") {
-					if c.ipam.IsIPAssignedToPod(staticIP, net.Subnet.Name, key) {
-						klog.Errorf("static address %s for %s has been assigned", staticIP, key)
+					if assignedPod, ok := c.ipam.IsIPAssignedToOtherPod(staticIP, net.Subnet.Name, key); ok {
+						klog.Errorf("static address %s for %s has been assigned to %", staticIP, key, assignedPod)
 						continue
 					}
 				}

diff --git a/pkg/ipam/ipam.go b/pkg/ipam/ipam.go
@@ -242,14 +242,14 @@ func (ipam *IPAM) ContainAddress(address string) bool {
 	return false
 }
 
-func (ipam *IPAM) IsIPAssignedToPod(ip, subnetName, podName string) bool {
+func (ipam *IPAM) IsIPAssignedToOtherPod(ip, subnetName, podName string) (string, bool) {
 	ipam.mutex.RLock()
 	defer ipam.mutex.RUnlock()
 
 	if subnet, ok := ipam.Subnets[subnetName]; !ok {
-		return false
+		return "", false
 	} else {
-		return subnet.isIPAssignedToPod(ip, podName)
+		return subnet.isIPAssignedToOtherPod(ip, podName)
 	}
 }
 

diff --git a/pkg/ipam/subnet.go b/pkg/ipam/subnet.go
@@ -551,20 +551,20 @@ func (subnet *Subnet) GetPodAddress(podName, nicName string) (IP, IP, string, st
 	}
 }
 
-func (subnet *Subnet) isIPAssignedToPod(ip, podName string) bool {
+func (subnet *Subnet) isIPAssignedToOtherPod(ip, podName string) (string, bool) {
 	if existPod, ok := subnet.V4IPToPod[IP(ip)]; ok {
 		klog.V(4).Infof("v4 check ip assigned, existPod %s, podName %s", existPod, podName)
 		pods := strings.Split(existPod, ",")
 		if !util.ContainsString(pods, podName) {
-			return true
+			return existPod, true
 		}
 	}
 	if existPod, ok := subnet.V6IPToPod[IP(ip)]; ok {
 		klog.V(4).Infof("v6 check ip assigned, existPod %s, podName %s", existPod, podName)
 		pods := strings.Split(existPod, ",")
 		if !util.ContainsString(pods, podName) {
-			return true
+			return existPod, true
 		}
 	}
-	return false
+	return "", false
 }