karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: clean the finalizer of mcs if the ExposureType transforms from CrossCluster to LoadBalancer 

Signed-off-by: jwcesign <jwcesign@gmail.com>
This commit is contained in:
jwcesign 2023-12-19 11:54:27 +08:00
parent 21b2842b06
commit 36ac29485e
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/controllers/multiclusterservice/mcs_controller.go
View File

@ -241,6 +241,15 @@ func (c *MCSController) handleMultiClusterServiceCreateOrUpdate(mcs *networkingv
if err := c.retrieveMultiClusterService(mcs, providerClusters); err != nil { if err := c.retrieveMultiClusterService(mcs, providerClusters); err != nil {
return err return err
} }
finalizersUpdated := controllerutil.RemoveFinalizer(mcs, util.MCSControllerFinalizer)
if finalizersUpdated {
err := c.Client.Update(context.Background(), mcs)
if err != nil {
klog.Errorf("Failed to remove finalizer(%s) from MultiClusterService(%s/%s):%v", util.MCSControllerFinalizer, mcs.Namespace, mcs.Name, err)
return err
}
}
return nil
} }
// 2. add finalizer if needed // 2. add finalizer if needed
@ -248,7 +257,7 @@ func (c *MCSController) handleMultiClusterServiceCreateOrUpdate(mcs *networkingv
if finalizersUpdated { if finalizersUpdated {
err := c.Client.Update(context.Background(), mcs) err := c.Client.Update(context.Background(), mcs)
if err != nil { if err != nil {
klog.Errorf("Failed to update MultiClusterService(%s/%s) with finalizer", mcs.Namespace, mcs.Name) klog.Errorf("Failed to add finalizer(%s) to MultiClusterService(%s/%s):%v ", util.MCSControllerFinalizer, mcs.Namespace, mcs.Name, err)
return err return err
} }
} }
@ -335,7 +344,7 @@ func (c *MCSController) retrieveService(mcs *networkingv1alpha1.MultiClusterServ
} }
if err = c.Client.Update(context.Background(), svc); err != nil { if err = c.Client.Update(context.Background(), svc); err != nil {
klog.Errorf("Failed to update service(%s/%s)", mcs.Namespace, mcs.Name, err) klog.Errorf("Failed to update service(%s/%s):%v", mcs.Namespace, mcs.Name, err)
return err return err
} }