no need to make sure node on ip

kubeovn · Aug 16, 2023 · 287b76c · 287b76c
1 parent 092383e
commit 287b76c
Showing 1 changed file with 17 additions and 13 deletions.
diff --git a/pkg/daemon/handler.go b/pkg/daemon/handler.go
@@ -331,33 +331,37 @@ func (csh cniServerHandler) handleAdd(req *restful.Request, resp *restful.Respon
 
 func (csh cniServerHandler) UpdateIPCr(podRequest request.CniRequest, subnet, ip string) error {
 	ipCrName := ovs.PodNameToPortName(podRequest.PodName, podRequest.PodNamespace, podRequest.Provider)
-	var err error
 	for i := 0; i < 20; i++ {
 		oriIpCr, err := csh.KubeOvnClient.KubeovnV1().IPs().Get(context.Background(), ipCrName, metav1.GetOptions{})
 		if err != nil {
 			err = fmt.Errorf("failed to get ip crd for %s, %v", ip, err)
 			// maybe create a backup pod with previous annotations
 			klog.Error(err)
 		} else {
-			ipCr := oriIpCr.DeepCopy()
-			ipCr.Spec.NodeName = csh.Config.NodeName
-			ipCr.Spec.AttachIPs = []string{}
-			ipCr.Labels[subnet] = ""
-			ipCr.Spec.AttachSubnets = []string{}
-			ipCr.Spec.AttachMacs = []string{}
-			if _, err := csh.KubeOvnClient.KubeovnV1().IPs().Update(context.Background(), ipCr, metav1.UpdateOptions{}); err != nil {
-				err = fmt.Errorf("failed to update ip crd for %s, %v", ip, err)
-				klog.Error(err)
-			} else {
-				return nil
+			if oriIpCr.Spec.NodeName != csh.Config.NodeName {
+				ipCr := oriIpCr.DeepCopy()
+				ipCr.Spec.NodeName = csh.Config.NodeName
+				ipCr.Spec.AttachIPs = []string{}
+				ipCr.Labels[subnet] = ""
+				ipCr.Spec.AttachSubnets = []string{}
+				ipCr.Spec.AttachMacs = []string{}
+				if _, err := csh.KubeOvnClient.KubeovnV1().IPs().Update(context.Background(), ipCr, metav1.UpdateOptions{}); err != nil {
+					err = fmt.Errorf("failed to update ip crd for %s, %v", ip, err)
+					klog.Error(err)
+				} else {
+					return nil
+				}
 			}
 		}
 		if err != nil {
 			klog.Warning("wait pod ip %s to be ready", ipCrName)
 			time.Sleep(1 * time.Second)
+		} else {
+			return nil
 		}
 	}
-	return err
+	// update ip spec node is not that necessary, so we just log the error
+	return nil
 }
 
 func (csh cniServerHandler) handleDel(req *restful.Request, resp *restful.Response) {