cleanup of code

Signed-off-by: Ashima-Ashima1 <[email protected]>

Author: ashimagarg27

controllers/ibmobjectcsi_controller.go

@@ -128,17 +128,11 @@ func (r *IBMObjectCSIReconciler) Reconcile(ctx context.Context, req ctrl.Request
 	}
 	// If the deletion timestamp is set, perform cleanup operations and remove a finalizer before returning from the reconciliation process.
 	if !instance.GetDeletionTimestamp().IsZero() {
-		isFinalizerExists, err := r.ControllerHelper.HasFinalizer(instance)
-		if err != nil {
+		if err := r.deleteClusterRoleBindings(instance); err != nil {
 			return reconcile.Result{}, err
 		}
-		// If the finalizer doesn't exist, return early, indicating that no further action is needed.
-
-		if !isFinalizerExists {
-			return reconcile.Result{}, nil
-		}
 
-		if err := r.deleteClusterRolesAndBindings(instance); err != nil {
+		if err := r.deleteClusterRoles(instance); err != nil {
 			return reconcile.Result{}, err
 		}
 
@@ -460,17 +454,6 @@ func (r *IBMObjectCSIReconciler) deleteCSIDriver(instance *crutils.IBMObjectCSI)
 	return nil
 }
 
-func (r *IBMObjectCSIReconciler) deleteClusterRolesAndBindings(instance *crutils.IBMObjectCSI) error {
-	if err := r.deleteClusterRoleBindings(instance); err != nil {
-		return err
-	}
-
-	if err := r.deleteClusterRoles(instance); err != nil {
-		return err
-	}
-	return nil
-}
-
 func (r *IBMObjectCSIReconciler) deleteClusterRoleBindings(instance *crutils.IBMObjectCSI) error {
 	clusterRoleBindings := r.getClusterRoleBindings(instance)
 	return r.ControllerHelper.DeleteClusterRoleBindings(clusterRoleBindings)

controllers/util/common/common.go

@@ -178,15 +178,6 @@ func (ch *ControllerHelper) getClusterRole(cr *rbacv1.ClusterRole) (*rbacv1.Clus
 	return found, err
 }
 
-func (ch *ControllerHelper) HasFinalizer(instance crutils.Instance) (bool, error) {
-	accessor, finalizerName, err := ch.getAccessorAndFinalizerName(instance)
-	if err != nil {
-		return false, err
-	}
-
-	return util.Contains(accessor.GetFinalizers(), finalizerName), nil
-}
-
 func (ch *ControllerHelper) AddFinalizerIfNotPresent(instance crutils.Instance,
 	unwrappedInstance client.Object) error {
 	logger := ch.Log.WithName("AddFinalizerIfNotPresent")