keep vm vip when enableKeepVmIP is true (#3053)

Co-authored-by: huangsm43 <huangsm43@midea.com>
kubeovn · Jul 19, 2023 · 52232b5 · 52232b5
1 parent ed58b21
commit 52232b5
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -1452,6 +1452,7 @@ func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, st
 	podName := c.getNameByPod(pod)
 	key := fmt.Sprintf("%s/%s", pod.Namespace, podName)
 
+	var isVMPod bool
 	isStsPod, _ := isStatefulSetPod(pod)
 	// if pod has static vip
 	vipName := pod.Annotations[util.VipAnnotation]
@@ -1462,7 +1463,10 @@ func (c *Controller) acquireAddress(pod *v1.Pod, podNet *kubeovnNet) (string, st
 			return "", "", "", podNet.Subnet, err
 		}
 		portName := ovs.PodNameToPortName(podName, pod.Namespace, podNet.ProviderName)
-		if err = c.podReuseVip(vipName, portName, isStsPod); err != nil {
+		if c.config.EnableKeepVmIP {
+			isVMPod, _ = isVmPod(pod)
+		}
+		if err = c.podReuseVip(vipName, portName, isStsPod || isVMPod); err != nil {
 			return "", "", "", podNet.Subnet, err
 		}
 		return vip.Status.V4ip, vip.Status.V6ip, vip.Status.Mac, podNet.Subnet, nil

diff --git a/pkg/controller/vip.go b/pkg/controller/vip.go
@@ -491,7 +491,7 @@ func (c *Controller) patchVipStatus(key, v4ip string, ready bool) error {
 	return nil
 }
 
-func (c *Controller) podReuseVip(key, portName string, isStsPod bool) error {
+func (c *Controller) podReuseVip(key, portName string, keepVIP bool) error {
 	// when pod use static vip, label vip reserved for pod
 	oriVip, err := c.virtualIpsLister.Get(key)
 	if err != nil {
@@ -505,7 +505,7 @@ func (c *Controller) podReuseVip(key, portName string, isStsPod bool) error {
 	var op string
 
 	if vip.Labels[util.IpReservedLabel] != "" {
-		if isStsPod && vip.Labels[util.IpReservedLabel] == portName {
+		if keepVIP && vip.Labels[util.IpReservedLabel] == portName {
 			return nil
 		} else {
 			return fmt.Errorf("vip '%s' is in use by pod %s", vip.Name, vip.Labels[util.IpReservedLabel])