review fixes

Author: chrischdi

internal/controllers/machine/machine_controller_noderef.go

@@ -311,10 +311,10 @@ func (r *Reconciler) patchNode(ctx context.Context, remoteClient client.Client,
 		} else {
 			hasTaintChanges = taints.RemoveNodeTaint(newNode, clusterv1.NodeOutdatedRevisionTaint) || hasTaintChanges
 		}
+	}
 
-		if !hasAnnotationChanges && !hasLabelChanges && !hasTaintChanges {
-			return nil
-		}
+	if !hasAnnotationChanges && !hasLabelChanges && !hasTaintChanges {
+		return nil
 	}
 
 	return remoteClient.Patch(ctx, newNode, client.StrategicMergeFrom(node))

internal/controllers/machine/machine_controller_noderef_test.go

@@ -780,8 +780,18 @@ func TestPatchNode(t *testing.T) {
 					Name: fmt.Sprintf("node-%s", util.RandomString(6)),
 				},
 			},
+			newLabels: map[string]string{
+				"label-from-machine": "foo",
+			},
+			newAnnotations: map[string]string{
+				"annotation-from-machine": "foo",
+			},
+			expectedLabels: map[string]string{
+				"label-from-machine": "foo",
+			},
 			expectedAnnotations: map[string]string{
-				clusterv1.LabelsFromMachineAnnotation: "",
+				"annotation-from-machine":             "foo",
+				clusterv1.LabelsFromMachineAnnotation: "label-from-machine",
 			},
 			expectedTaints: []corev1.Taint{
 				{Key: "node.kubernetes.io/not-ready", Effect: "NoSchedule"}, // Added by the API server