Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions internal/controller/openstacklightspeed_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -260,24 +260,6 @@ func (r *OpenStackLightspeedReconciler) reconcileDelete(
Log := r.GetLogger(ctx)
Log.Info("OpenStackLightspeed Reconciling Delete")

isRemoved, err := RemoveOLSConfig(ctx, helper, instance)
if err != nil {
return ctrl.Result{}, err
} else if !isRemoved {
Log.Info("OLSConfig removal in progress ...")
return ctrl.Result{RequeueAfter: time.Second * 10}, nil
}

isUninstalled, err := UninstallInstanceOwnedOLSOperator(ctx, helper, instance)
if err != nil {
return ctrl.Result{}, err
} else if !isUninstalled {
Log.Info("OLS Operator uninstallation in progress ...")
return ctrl.Result{RequeueAfter: time.Second * 10}, nil
}

controllerutil.RemoveFinalizer(instance, helper.GetFinalizer())

Log.Info("OpenStackLightspeed Reconciling Delete completed")
return ctrl.Result{}, nil
}
Expand Down
Loading