Avoid duplicated irreconcilable status

operator-framework · Jul 31, 2023 · 6a51ffc · 6a51ffc
1 parent a775742
commit 6a51ffc
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/reconciler/reconciler.go b/pkg/reconciler/reconciler.go
@@ -625,7 +625,6 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.
 		)
 		return ctrl.Result{}, err
 	}
-	u.UpdateStatus(updater.EnsureCondition(conditions.Irreconcilable(corev1.ConditionFalse, "", "")))
 
 	for _, h := range r.preHooks {
 		if err := h.Exec(obj, vals, log); err != nil {
@@ -651,7 +650,9 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.
 			return ctrl.Result{}, err
 		}
 	default:
-		return ctrl.Result{}, fmt.Errorf("unexpected release state: %s", state)
+		err := fmt.Errorf("unexpected release state: %s", state)
+		u.UpdateStatus(updater.EnsureCondition(conditions.Irreconcilable(corev1.ConditionTrue, conditions.ReasonReconcileError, err)))
+		return ctrl.Result{}, err
 	}
 
 	for _, h := range r.postHooks {