allow ip change name in migration (#4133)

* allow ip change name in migration --------- Signed-off-by: bobz965 <[email protected]> Co-authored-by: 张祖建 <[email protected]>
kubeovn · Jun 7, 2024 · 7220a5e · 7220a5e
1 parent d6b4194
commit 7220a5e
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 10 deletions.
diff --git a/pkg/controller/ip.go b/pkg/controller/ip.go
@@ -80,9 +80,6 @@ func (c *Controller) enqueueUpdateIP(oldObj, newObj interface{}) {
 	if oldIP.Spec.MacAddress != "" && newIP.Spec.MacAddress != oldIP.Spec.MacAddress {
 		klog.Errorf("ip %s macAddress can not change", newIP.Name)
 	}
-	if oldIP.Spec.NodeName != "" && newIP.Spec.NodeName != oldIP.Spec.NodeName {
-		klog.Errorf("ip %s nodeName can not change", newIP.Name)
-	}
 	if oldIP.Spec.V4IPAddress != "" && newIP.Spec.V4IPAddress != oldIP.Spec.V4IPAddress {
 		klog.Errorf("ip %s v4IPAddress can not change", newIP.Name)
 	}

diff --git a/pkg/controller/node.go b/pkg/controller/node.go
@@ -527,7 +527,7 @@ func (c *Controller) handleDeleteNode(key string) error {
 			return err
 		}
 	}
-
+	klog.Infof("delete node ip %s", portName)
 	if err = c.config.KubeOvnClient.KubeovnV1().IPs().Delete(context.Background(), portName, metav1.DeleteOptions{}); err != nil && !k8serrors.IsNotFound(err) {
 		return err
 	}

diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -1259,11 +1259,10 @@ func (c *Controller) syncKubeOvnNet(cachedPod, pod *v1.Pod, podNets []*kubeovnNe
 	}
 
 	for _, portNeedDel := range portsNeedToDel {
-
+		klog.Infof("release port %s for pod %s", portNeedDel, podName)
 		if subnet, ok := c.ipam.Subnets[subnetUsedByPort[portNeedDel]]; ok {
 			subnet.ReleaseAddressWithNicName(podName, portNeedDel)
 		}
-
 		if err := c.OVNNbClient.DeleteLogicalSwitchPort(portNeedDel); err != nil {
 			klog.Errorf("failed to delete lsp %s, %v", portNeedDel, err)
 			return nil, err

diff --git a/pkg/webhook/ip.go b/pkg/webhook/ip.go
@@ -73,10 +73,6 @@ func (v *ValidatingHook) IPUpdateHook(ctx context.Context, req admission.Request
 		err := fmt.Errorf("ip %s macAddress can not change", ipNew.Name)
 		return ctrlwebhook.Errored(http.StatusBadRequest, err)
 	}
-	if ipOld.Spec.NodeName != "" && ipNew.Spec.NodeName != ipOld.Spec.NodeName {
-		err := fmt.Errorf("ip %s nodeName can not change", ipNew.Name)
-		return ctrlwebhook.Errored(http.StatusBadRequest, err)
-	}
 	return ctrlwebhook.Allowed("by pass")
 }