Skip to content

Commit ecc2c37

Browse files
committed
Remove deletion timestamp check from NHC timeout logic, as it would cause a bug which will prevent SNR from removing the finilizer on an orphaned CR
Signed-off-by: Michael Shitrit <[email protected]>
1 parent 4e07717 commit ecc2c37

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

controllers/selfnoderemediation_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -807,7 +807,7 @@ func (r *SelfNodeRemediationReconciler) removeNoExecuteTaint(node *v1.Node) erro
807807
}
808808

809809
func (r *SelfNodeRemediationReconciler) isStoppedByNHC(snr *v1alpha1.SelfNodeRemediation) bool {
810-
if snr != nil && snr.Annotations != nil && snr.DeletionTimestamp == nil {
810+
if snr != nil && snr.Annotations != nil {
811811
_, isTimeoutIssued := snr.Annotations[nhcTimeOutAnnotation]
812812
return isTimeoutIssued
813813
}

0 commit comments

Comments
 (0)