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

Merge pull request #4448 from jwcesign/remove-finalizer 

fix: clean the finalizer of mcs if the ExposureType transforms from CrossCluster to LoadBalancer
This commit is contained in:
karmada-bot 2023-12-20 09:22:15 +08:00 committed by GitHub
parent 33c98a4e44 36ac29485e
commit ba76508fd3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 {
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
@ -248,7 +257,7 @@ func (c *MCSController) handleMultiClusterServiceCreateOrUpdate(mcs *networkingv
if finalizersUpdated {
err := c.Client.Update(context.Background(), mcs)
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
}
}
@ -335,7 +344,7 @@ func (c *MCSController) retrieveService(mcs *networkingv1alpha1.MultiClusterServ
}
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
}