delete check for existing ip cr (#3361)

Signed-off-by: 马洪贞 <hzma@alauda.io>
kubeovn · Nov 6, 2023 · e36c6b9 · e36c6b9
1 parent 6300097
commit e36c6b9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 20 deletions.
diff --git a/pkg/controller/init.go b/pkg/controller/init.go
@@ -328,9 +328,7 @@ func (c *Controller) InitIPAM() error {
 		return err
 	}
 
-	ipsMap := make(map[string]*kubeovnv1.IP, len(ips))
 	for _, ip := range ips {
-		ipsMap[ip.Name] = ip
 		// recover sts and kubevirt vm ip, other ip recover in later pod loop
 		if ip.Spec.PodType != "StatefulSet" && ip.Spec.PodType != util.Vm {
 			continue
@@ -377,8 +375,7 @@ func (c *Controller) InitIPAM() error {
 				if err != nil {
 					klog.Errorf("failed to init pod %s.%s address %s: %v", podName, pod.Namespace, pod.Annotations[fmt.Sprintf(util.IpAddressAnnotationTemplate, podNet.ProviderName)], err)
 				} else {
-					ipCR := ipsMap[portName]
-					err = c.createOrUpdateCrdIPs(podName, ip, mac, subnet, pod.Namespace, pod.Spec.NodeName, podNet.ProviderName, podType, &ipCR)
+					err = c.createOrUpdateCrdIPs(podName, ip, mac, subnet, pod.Namespace, pod.Spec.NodeName, podNet.ProviderName, podType)
 					if err != nil {
 						klog.Errorf("failed to create/update ips CR %s.%s with ip address %s: %v", podName, pod.Namespace, ip, err)
 					}

diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -320,7 +320,7 @@ func (c *Controller) handleAddNode(key string) error {
 		return err
 	}
 
-	if err := c.createOrUpdateCrdIPs("", ipStr, mac, c.config.NodeSwitch, "", node.Name, "", "", nil); err != nil {
+	if err := c.createOrUpdateCrdIPs("", ipStr, mac, c.config.NodeSwitch, "", node.Name, "", ""); err != nil {
 		klog.Errorf("failed to create or update IPs node-%s: %v", key, err)
 		return err
 	}
@@ -602,7 +602,7 @@ func (c *Controller) handleUpdateNode(key string) error {
 	return nil
 }
 
-func (c *Controller) createOrUpdateCrdIPs(podName, ip, mac, subnetName, ns, nodeName, providerName, podType string, existingCR **kubeovnv1.IP) error {
+func (c *Controller) createOrUpdateCrdIPs(podName, ip, mac, subnetName, ns, nodeName, providerName, podType string) error {
 	var key, ipName string
 	if subnetName == c.config.NodeSwitch {
 		key = nodeName
@@ -617,19 +617,15 @@ func (c *Controller) createOrUpdateCrdIPs(podName, ip, mac, subnetName, ns, node
 
 	var err error
 	var ipCr *kubeovnv1.IP
-	if existingCR != nil {
-		ipCr = *existingCR
-	} else {
-		ipCr, err = c.config.KubeOvnClient.KubeovnV1().IPs().Get(context.Background(), ipName, metav1.GetOptions{})
-		if err != nil {
-			if !k8serrors.IsNotFound(err) {
-				errMsg := fmt.Errorf("failed to get ip CR %s: %v", ipName, err)
-				klog.Error(errMsg)
-				return errMsg
-			}
-			// the returned pointer is not nil if the CR does not exist
-			ipCr = nil
+	ipCr, err = c.config.KubeOvnClient.KubeovnV1().IPs().Get(context.Background(), ipName, metav1.GetOptions{})
+	if err != nil {
+		if !k8serrors.IsNotFound(err) {
+			errMsg := fmt.Errorf("failed to get ip CR %s: %v", ipName, err)
+			klog.Error(errMsg)
+			return errMsg
 		}
+		// the returned pointer is not nil if the CR does not exist
+		ipCr = nil
 	}
 
 	v4IP, v6IP := util.SplitStringIP(ip)

diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -547,7 +547,7 @@ func (c *Controller) handleAddPod(key string) error {
 
 		podType := getPodType(pod)
 		podName := c.getNameByPod(pod)
-		if err := c.createOrUpdateCrdIPs(podName, ipStr, mac, subnet.Name, pod.Namespace, pod.Spec.NodeName, podNet.ProviderName, podType, nil); err != nil {
+		if err := c.createOrUpdateCrdIPs(podName, ipStr, mac, subnet.Name, pod.Namespace, pod.Spec.NodeName, podNet.ProviderName, podType); err != nil {
 			err = fmt.Errorf("failed to create ips CR %s.%s: %v", podName, pod.Namespace, err)
 			klog.Error(err)
 			return err

diff --git a/pkg/controller/subnet.go b/pkg/controller/subnet.go
@@ -1258,7 +1258,7 @@ func (c *Controller) reconcileU2OInterconnectionIP(subnet *kubeovnv1.Subnet) err
 			case kubeovnv1.ProtocolDual:
 				subnet.Status.U2OInterconnectionIP = fmt.Sprintf("%s,%s", v4ip, v6ip)
 			}
-			if err := c.createOrUpdateCrdIPs(u2oInterconnName, subnet.Status.U2OInterconnectionIP, "", subnet.Name, "default", "", "", "", nil); err != nil {
+			if err := c.createOrUpdateCrdIPs(u2oInterconnName, subnet.Status.U2OInterconnectionIP, "", subnet.Name, "default", "", "", ""); err != nil {
 				klog.Errorf("failed to create or update IPs of %s : %v", u2oInterconnLrpName, err)
 				return err
 			}