Skip to content

Commit 079ae1b

Browse files
committed
Remove tautology
Signed-off-by: Matheus Pimenta <[email protected]>
1 parent 8555152 commit 079ae1b

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

internal/reconcile/atomic_release.go

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -283,16 +283,11 @@ func (r *AtomicRelease) Reconcile(ctx context.Context, req *Request) error {
283283
conditions.MarkReconciling(req.Object, meta.ProgressingWithRetryReason, "%s", conditions.GetMessage(req.Object, meta.ReadyCondition))
284284
return ErrMustRequeue
285285
}
286-
// Check if retries have exhausted after remediation for early
287-
// stall condition detection.
288-
if remediation != nil && remediation.RetriesExhausted(req.Object) {
289-
conditions.MarkStalled(req.Object, "RetriesExceeded", "Failed to %s after %d attempt(s)",
290-
req.Object.Status.LastAttemptedReleaseAction, req.Object.GetActiveRemediation().GetFailureCount(req.Object))
291-
return ErrExceededMaxRetries
292-
}
293286

294-
conditions.Delete(req.Object, meta.ReconcilingCondition)
295-
return nil
287+
// Retries have exhausted after remediation for early stall condition detection.
288+
conditions.MarkStalled(req.Object, "RetriesExceeded", "Failed to %s after %d attempt(s)",
289+
req.Object.Status.LastAttemptedReleaseAction, req.Object.GetActiveRemediation().GetFailureCount(req.Object))
290+
return ErrExceededMaxRetries
296291
}
297292

298293
// Append the type to the set of action types we have performed.

0 commit comments

Comments
 (0)