Merge pull request #173 from mshitrit/clearer-condition

improve condition name
medik8s · Jan 7, 2024 · fd6af23 · fd6af23
2 parents 75eb80b + 642302c
commit fd6af23
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/controllers/selfnoderemediation_controller.go b/controllers/selfnoderemediation_controller.go
@@ -98,7 +98,7 @@ const (
 	remediationStarted              processingChangeReason = "RemediationStarted"
 	remediationTimeoutByNHC         processingChangeReason = "RemediationTimeoutByNHC"
 	remediationFinishedSuccessfully processingChangeReason = "RemediationFinishedSuccessfully"
-	remediationFinishedNodeNotFound processingChangeReason = "RemediationFinishedNodeNotFound"
+	remediationSkippedNodeNotFound  processingChangeReason = "RemediationSkippedNodeNotFound"
 )
 
 type remediationPhase string
@@ -238,7 +238,7 @@ func (r *SelfNodeRemediationReconciler) Reconcile(ctx context.Context, req ctrl.
 	if err != nil {
 		if apiErrors.IsNotFound(err) {
 			r.logger.Info("couldn't find node matching remediation", "node name", snr.Name)
-			if err = r.updateConditions(remediationFinishedNodeNotFound, snr); err != nil {
+			if err = r.updateConditions(remediationSkippedNodeNotFound, snr); err != nil {
 				return ctrl.Result{}, err
 			}
 			r.Recorder.Event(snr, eventTypeNormal, eventReasonRemediationStopped, "couldn't find node matching remediation")
@@ -281,7 +281,7 @@ func (r *SelfNodeRemediationReconciler) updateConditions(processingTypeReason pr
 	case remediationTimeoutByNHC:
 		processingConditionStatus = metav1.ConditionFalse
 		succeededConditionStatus = metav1.ConditionFalse
-	case remediationFinishedNodeNotFound:
+	case remediationSkippedNodeNotFound:
 		processingConditionStatus = metav1.ConditionFalse
 		succeededConditionStatus = metav1.ConditionFalse
 	default:

diff --git a/controllers/tests/controller/selfnoderemediation_controller_test.go b/controllers/tests/controller/selfnoderemediation_controller_test.go
@@ -261,7 +261,7 @@ var _ = Describe("SNR Controller", func() {
 				})
 
 				It("remediation should stop and update conditions", func() {
-					verifyTypeConditions(snr.Name, metav1.ConditionFalse, metav1.ConditionFalse, "RemediationFinishedNodeNotFound")
+					verifyTypeConditions(snr.Name, metav1.ConditionFalse, metav1.ConditionFalse, "RemediationSkippedNodeNotFound")
 
 					verifyEvent("Normal", "RemediationStopped", "couldn't find node matching remediation")
 				})
@@ -409,7 +409,7 @@ var _ = Describe("SNR Controller", func() {
 						It("Node is not found", func() {
 							time.Sleep(time.Second)
 							verifyNoEvent("Normal", "MarkUnschedulable", "Remediation process - unhealthy node marked as unschedulable")
-							verifyTypeConditions(snr.Name, metav1.ConditionFalse, metav1.ConditionFalse, "RemediationFinishedNodeNotFound")
+							verifyTypeConditions(snr.Name, metav1.ConditionFalse, metav1.ConditionFalse, "RemediationSkippedNodeNotFound")
 							verifyEvent("Normal", "RemediationStopped", "couldn't find node matching remediation")
 						})
 					})