Allow external remediation even if there's no controller owner

Signed-off-by: Nir <niry@redhat.com>
openshift · May 4, 2020 · bb8cab8 · bb8cab8
1 parent 008d912
commit bb8cab8
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/pkg/controller/machinehealthcheck/machinehealthcheck_controller.go b/pkg/controller/machinehealthcheck/machinehealthcheck_controller.go
@@ -435,10 +435,6 @@ func (r *ReconcileMachineHealthCheck) mhcRequestsFromMachine(o handler.MapObject
 
 func (t *target) remediate(r *ReconcileMachineHealthCheck) error {
 	glog.Infof(" %s: start remediation logic", t.string())
-	if !t.hasControllerOwner() {
-		glog.Infof("%s: no controller owner, skipping remediation", t.string())
-		return nil
-	}
 
 	remediationStrategy, ok := t.MHC.Annotations[remediationStrategyAnnotation]
 	if ok {
@@ -447,6 +443,11 @@ func (t *target) remediate(r *ReconcileMachineHealthCheck) error {
 		}
 	}
 
+	if !t.hasControllerOwner() {
+		glog.Infof("%s: no controller owner, skipping remediation", t.string())
+		return nil
+	}
+
 	glog.Infof("%s: deleting", t.string())
 	if err := r.client.Delete(context.TODO(), &t.Machine); err != nil {
 		r.recorder.Eventf(