Fix finalizers removal in reconcileDelete

Author: lpiwowar

controllers/lightspeed/openstacklightspeed_controller.go

@@ -227,15 +227,12 @@ func (r *OpenStackLightspeedReconciler) reconcileDelete(
 	helper *common_helper.Helper,
 	instance *lightspeedv1beta1.OpenStackLightspeed,
 ) (ctrl.Result, error) {
-	if ok := controllerutil.RemoveFinalizer(instance, helper.GetFinalizer()); !ok {
-		return ctrl.Result{}, fmt.Errorf("remove finalizer failed")
-	}
-
 	olsConfig, err := lightspeed.GetOLSConfig(ctx, helper)
-	if err != nil && !k8s_errors.IsNotFound(err) {
-		return ctrl.Result{}, err
-	} else if err != nil {
+	if err != nil && k8s_errors.IsNotFound(err) {
+		controllerutil.RemoveFinalizer(instance, helper.GetFinalizer())
 		return ctrl.Result{}, nil
+	} else if err != nil {
+		return ctrl.Result{}, err
 	}
 
 	ownerLabel := olsConfig.GetLabels()[lightspeed.OpenStackLightspeedOwnerIDLabel]
@@ -261,6 +258,8 @@ func (r *OpenStackLightspeedReconciler) reconcileDelete(
 		return ctrl.Result{}, err
 	}
 
+	controllerutil.RemoveFinalizer(instance, helper.GetFinalizer())
+
 	return ctrl.Result{}, nil
 }