fix: eip deletion (#2118)

When eip and routed annotation deleted the nat and route rule are not deleted.
kubeovn · Dec 4, 2022 · 141c4c3 · 141c4c3
1 parent 86f75c8
commit 141c4c3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/pkg/controller/pod.go b/pkg/controller/pod.go
@@ -879,6 +879,10 @@ func (c *Controller) handleUpdatePod(key string) error {
 						klog.Errorf("failed to add static route, %v", err)
 						return err
 					}
+				} else {
+					if err := c.ovnLegacyClient.DeleteStaticRoute(podIP, c.config.ClusterRouter); err != nil {
+						return err
+					}
 				}
 			}
 

diff --git a/pkg/ovs/ovn-nbctl-legacy.go b/pkg/ovs/ovn-nbctl-legacy.go
@@ -1169,8 +1169,8 @@ func parseLrRouteListOutput(output string) (routeList []*StaticRoute, err error)
 
 func (c LegacyClient) UpdateNatRule(policy, logicalIP, externalIP, router, logicalMac, port string) error {
 	// when dual protocol pod has eip or snat, will add nat for all dual addresses.
-	// will failed when logicalIP externalIP is different protocol.
-	if util.CheckProtocol(logicalIP) != util.CheckProtocol(externalIP) {
+	// will fail when logicalIP externalIP is different protocol.
+	if externalIP != "" && util.CheckProtocol(logicalIP) != util.CheckProtocol(externalIP) {
 		return nil
 	}