fix issue 4803: The two names should have a containment relationship (#…

…4807) * fix issue 4803: The two names should have a containment relationship Signed-off-by: liwenjian <liwenjian@tfcloud.com> * fix issue 4803: The two names should have a containment relationship Signed-off-by: liwenjian <liwenjian@tfcloud.com> --------- Signed-off-by: liwenjian <liwenjian@tfcloud.com> Co-authored-by: liwenjian <liwenjian@tfcloud.com>
kubeovn · Dec 11, 2024 · 67f5a1e · 67f5a1e
1 parent ad46a78
commit 67f5a1e
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/pkg/webhook/static_ip.go b/pkg/webhook/static_ip.go
@@ -195,7 +195,9 @@ func (v *ValidatingHook) checkIPConflict(ipAddress, annoSubnet, name string, ipL
 				return err
 			}
 			if ipAddr.String() == v4IP || ipAddr.String() == v6IP {
-				if name == ipCR.Spec.PodName {
+				// The IP's spec podName does not equal the Pod name in the request;
+				// The two names have a containment relationship.
+				if name == ipCR.Spec.PodName || ipCR.Spec.PodType == util.VM && strings.Contains(ipCR.Spec.PodName, name) {
 					klog.Infof("get same ip crd for %s", name)
 				} else {
 					err := fmt.Errorf("annotation static-ip %s is conflict with ip crd %s, ip %s", ipAddr.String(), ipCR.Name, ipCR.Spec.IPAddress)