Skip to content
Merged
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
5 changes: 4 additions & 1 deletion pkg/component/reconciler.go
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,11 @@ func (r *Reconciler[T]) Reconcile(ctx context.Context, req ctrl.Request) (result
status.ProcessingDigest = ""
status.ProcessingSince = nil
}
if status.State == StateProcessing && now.Sub(status.ProcessingSince.Time) >= timeout {
if status.State == StateProcessing && err == nil && now.Sub(status.ProcessingSince.Time) >= timeout {
// TODO: maybe it would be better to have a dedicated StateTimeout?
// note: it is guaranteed that status.ProcessingSince is not nil here because
// - it was not cleared above because of the mutually exclusive clauses on status.State and err
// - it was set during reconcile when state was set to StateProcessing
status.SetState(StateError, readyConditionReasonTimeout, "Reconcilation of dependent resources timed out")
}

Expand Down