diff --git a/pkg/controller/ovn_dnat.go b/pkg/controller/ovn_dnat.go index 18cc1f7266d..0584bfc972e 100644 --- a/pkg/controller/ovn_dnat.go +++ b/pkg/controller/ovn_dnat.go @@ -224,7 +224,7 @@ func (c *Controller) handleAddOvnDnatRule(key string) error { klog.Errorf("failed to patch status for dnat %s, %v", key, err) return err } - if err = c.patchOvnEipStatus(eipName, true); err != nil { + if err = c.patchOvnEipStatus(eipName); err != nil { klog.Errorf("failed to patch status for eip %s, %v", key, err) return err } diff --git a/pkg/controller/ovn_eip.go b/pkg/controller/ovn_eip.go index 1716433af4e..d93db943671 100644 --- a/pkg/controller/ovn_eip.go +++ b/pkg/controller/ovn_eip.go @@ -122,7 +122,7 @@ func (c *Controller) handleAddOvnEip(key string) error { } if cachedEip.Spec.Type != util.OvnEipTypeLSP { // node ext gw use lsp eip, has a nic on gw node, so left node to make it ready - if err = c.patchOvnEipStatus(key, true); err != nil { + if err = c.patchOvnEipStatus(key); err != nil { klog.Errorf("failed to patch ovn eip %s: %v", key, err) return err } @@ -193,7 +193,7 @@ func (c *Controller) handleResetOvnEip(key string) error { return nil } klog.Infof("handle reset ovn eip %s", cachedEip.Name) - if err := c.patchOvnEipStatus(key, true); err != nil { + if err := c.patchOvnEipStatus(key); err != nil { klog.Errorf("failed to reset nat for eip %s, %v", key, err) return err } @@ -364,7 +364,7 @@ func (c *Controller) createOrUpdateOvnEipCR(key, subnet, v4ip, v6ip, mac, usageT return nil } -func (c *Controller) patchOvnEipStatus(key string, ready bool) error { +func (c *Controller) patchOvnEipStatus(key string) error { cachedOvnEip, err := c.ovnEipsLister.Get(key) if err != nil { klog.Errorf("failed to get cached ovn eip '%s', %v", key, err) @@ -372,10 +372,6 @@ func (c *Controller) patchOvnEipStatus(key string, ready bool) error { } ovnEip := cachedOvnEip.DeepCopy() changed := false - if ovnEip.Status.Ready != ready { - ovnEip.Status.Ready = ready - changed = true - } if ovnEip.Status.MacAddress == "" { // not support change ip ovnEip.Status.V4Ip = cachedOvnEip.Spec.V4Ip diff --git a/pkg/controller/ovn_fip.go b/pkg/controller/ovn_fip.go index 3b12cd9621a..9bf797d819a 100644 --- a/pkg/controller/ovn_fip.go +++ b/pkg/controller/ovn_fip.go @@ -209,7 +209,7 @@ func (c *Controller) handleAddOvnFip(key string) error { klog.Errorf("failed to patch status for fip %s, %v", key, err) return err } - if err = c.patchOvnEipStatus(eipName, true); err != nil { + if err = c.patchOvnEipStatus(eipName); err != nil { klog.Errorf("failed to patch status for eip %s, %v", key, err) return err } diff --git a/pkg/controller/ovn_snat.go b/pkg/controller/ovn_snat.go index 85422b8eaad..3e2acc63809 100644 --- a/pkg/controller/ovn_snat.go +++ b/pkg/controller/ovn_snat.go @@ -165,7 +165,7 @@ func (c *Controller) handleAddOvnSnatRule(key string) error { klog.Errorf("failed to update status for snat %s, %v", key, err) return err } - if err = c.patchOvnEipStatus(eipName, true); err != nil { + if err = c.patchOvnEipStatus(eipName); err != nil { klog.Errorf("failed to patch status for eip %s, %v", key, err) return err }