Remediate only if machine object wasn't changed previously to avoid c…

…onflicts

Signed-off-by: Nir <niry@redhat.com>

pkg/cloud/baremetal/actuators/machine/actuator.go

@@ -134,7 +134,7 @@ func (a *Actuator) Create(ctx context.Context, cluster *clusterv1.Cluster, machi
 		return err
 	}
 
-	err = a.ensureAnnotation(ctx, machine, host)
+	err, _ = a.ensureAnnotation(ctx, machine, host)
 	if err != nil {
 		return err
 	}
@@ -250,13 +250,15 @@ func (a *Actuator) Update(ctx context.Context, cluster *clusterv1.Cluster, machi
 		return nil
 	}
 
-	err = a.ensureAnnotation(ctx, machine, host)
+	err, dirty := a.ensureAnnotation(ctx, machine, host)
 	if err != nil {
 		return err
 	}
 
-	if err := a.remediateIfNeeded(ctx, machine, host); err != nil {
-		return err
+	if !dirty {
+		if err := a.remediateIfNeeded(ctx, machine, host); err != nil {
+			return err
+		}
 	}
 
 	if err := a.updateMachineStatus(ctx, machine, host); err != nil {
@@ -464,26 +466,26 @@ func (a *Actuator) setHostSpec(ctx context.Context, host *bmh.BareMetalHost, mac
 
 // ensureAnnotation makes sure the machine has an annotation that references the
 // host and uses the API to update the machine if necessary.
-func (a *Actuator) ensureAnnotation(ctx context.Context, machine *machinev1.Machine, host *bmh.BareMetalHost) error {
+func (a *Actuator) ensureAnnotation(ctx context.Context, machine *machinev1.Machine, host *bmh.BareMetalHost) (error, bool) {
 	annotations := machine.ObjectMeta.GetAnnotations()
 	if annotations == nil {
 		annotations = make(map[string]string)
 	}
 	hostKey, err := cache.MetaNamespaceKeyFunc(host)
 	if err != nil {
 		log.Printf("Error parsing annotation value \"%s\": %v", hostKey, err)
-		return err
+		return err, false
 	}
 	existing, ok := annotations[HostAnnotation]
 	if ok {
 		if existing == hostKey {
-			return nil
+			return nil, false
 		}
 		log.Printf("Warning: found stray annotation for host %s on machine %s. Overwriting.", existing, machine.Name)
 	}
 	annotations[HostAnnotation] = hostKey
 	machine.ObjectMeta.SetAnnotations(annotations)
-	return a.client.Update(ctx, machine)
+	return a.client.Update(ctx, machine), true
 }
 
 // setError sets the ErrorMessage and ErrorReason fields on the machine and logs