Fix MS tests + make mirror Node Ready more robust

Author: fabriziopandini

internal/controllers/machine/machine_controller_noderef.go

@@ -153,12 +153,12 @@ func (r *Reconciler) reconcileNode(ctx context.Context, s *scope) (ctrl.Result,
 		r.recorder.Event(machine, corev1.EventTypeNormal, "SuccessfulSetInterruptibleNodeLabel", s.node.Name)
 	}
 
-	// Do the remaining node health checks, then set the node health to true if all checks pass.
 	if s.infraMachine == nil || !s.infraMachine.GetDeletionTimestamp().IsZero() {
 		conditions.MarkFalse(s.machine, clusterv1.MachineNodeHealthyCondition, clusterv1.DeletingReason, clusterv1.ConditionSeverityInfo, "")
 		return ctrl.Result{}, nil
 	}
 
+	// Do the remaining node health checks, then set the node health to true if all checks pass.
 	status, message := summarizeNodeConditions(s.node)
 	if status == corev1.ConditionFalse {
 		conditions.MarkFalse(machine, clusterv1.MachineNodeHealthyCondition, clusterv1.NodeConditionsFailedReason, clusterv1.ConditionSeverityWarning, message)

internal/controllers/machine/machine_controller_status.go

@@ -230,11 +230,15 @@ func setNodeHealthyAndReadyConditions(ctx context.Context, machine *clusterv1.Ma
 				if condition.Message != "" {
 					message = fmt.Sprintf("%s (from Node)", condition.Message)
 				}
+				reason := condition.Reason
+				if reason == "" {
+					reason = clusterv1.NoV1Beta2ReasonReported
+				}
 				nodeReady = &metav1.Condition{
 					Type:               clusterv1.MachineNodeReadyV1Beta2Condition,
 					Status:             metav1.ConditionStatus(condition.Status),
 					LastTransitionTime: condition.LastTransitionTime,
-					Reason:             condition.Reason,
+					Reason:             reason,
 					Message:            message,
 				}
 			}

internal/controllers/machineset/suite_test.go

@@ -182,7 +182,7 @@ func fakeMachineNodeRef(m *clusterv1.Machine, pid string, g *WithT) {
 
 	// Patch the node and make it look like ready.
 	patchNode := client.MergeFrom(node.DeepCopy())
-	node.Status.Conditions = append(node.Status.Conditions, corev1.NodeCondition{Type: corev1.NodeReady, Status: corev1.ConditionTrue})
+	node.Status.Conditions = append(node.Status.Conditions, corev1.NodeCondition{Type: corev1.NodeReady, Status: corev1.ConditionTrue, Reason: "SomeReason"})
 	g.Expect(env.Status().Patch(ctx, node, patchNode)).To(Succeed())
 
 	// Patch the Machine.