Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove finilizer when deleted SNR is marked with NHC Timeout #247

Merged
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
6 changes: 6 additions & 0 deletions controllers/selfnoderemediation_controller.go
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,12 @@ func (r *SelfNodeRemediationReconciler) ReconcileManager(ctx context.Context, re
}

if r.isStoppedByNHC(snr) {
//This remediation is no longer relevant, most likely because fixed by a different remediator.
if snr.GetDeletionTimestamp() != nil {
//Removing finalizer so NHC deletion of the remediation can be completed
r.logger.Info("Removing finalizer of timed-out remediation deleted by NHC", "remediation name", snr.GetName())
return ctrl.Result{}, r.removeFinalizer(snr)
}
r.logger.Info("NHC added the timed-out annotation, remediation will be stopped")
events.RemediationStoppedByNHC(r.Recorder, snr)
return ctrl.Result{}, r.updateConditions(remediationTimeoutByNHC, snr)
Expand Down
Loading