From e025a07c9bf5762c2403930388825f98aa30a6ef Mon Sep 17 00:00:00 2001 From: Jean-Marc Andre Date: Mon, 27 Feb 2023 18:21:43 +0100 Subject: [PATCH] Should be able to delete bs even if the bc has already been deleted --- controllers/backupsession_controller.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/controllers/backupsession_controller.go b/controllers/backupsession_controller.go index 6ebd11f..e86b662 100644 --- a/controllers/backupsession_controller.go +++ b/controllers/backupsession_controller.go @@ -62,15 +62,6 @@ func (r *BackupSessionReconciler) Reconcile(ctx context.Context, req ctrl.Reques } return ctrl.Result{}, err } - backupConf := formolv1alpha1.BackupConfiguration{} - if err := r.Get(ctx, client.ObjectKey{ - Namespace: backupSession.Spec.Ref.Namespace, - Name: backupSession.Spec.Ref.Name, - }, &backupConf); err != nil { - r.Log.Error(err, "unable to get BackupConfiguration") - return ctrl.Result{}, err - } - if !backupSession.ObjectMeta.DeletionTimestamp.IsZero() { r.Log.V(0).Info("BackupSession is being deleted") if controllerutil.ContainsFinalizer(&backupSession, finalizerName) { @@ -90,6 +81,14 @@ func (r *BackupSessionReconciler) Reconcile(ctx context.Context, req ctrl.Reques } return ctrl.Result{}, err } + backupConf := formolv1alpha1.BackupConfiguration{} + if err := r.Get(ctx, client.ObjectKey{ + Namespace: backupSession.Spec.Ref.Namespace, + Name: backupSession.Spec.Ref.Name, + }, &backupConf); err != nil { + r.Log.Error(err, "unable to get BackupConfiguration") + return ctrl.Result{}, err + } var newSessionState formolv1alpha1.SessionState switch backupSession.Status.SessionState {