Address feedback

Author: fabriziopandini

internal/controllers/machinedeployment/machinedeployment_rollout_rollingupdate_test.go

@@ -991,7 +991,7 @@ func TestReconcileInPlaceUpdateIntent(t *testing.T) {
 			canUpdateAnswer: map[string]bool{
 				"ms1": true,
 			},
-			expectMoveFromMS:   []string{"ms1"},
+			expectMoveFromMS: []string{"ms1"},
 			expectScaleIntents: map[string]int32{
 				// "ms2": 3, +3 replica using maxSurge dropped, oldMS is scaling down
 			},
@@ -1029,7 +1029,7 @@ func TestReconcileInPlaceUpdateIntent(t *testing.T) {
 		},
 		{
 			name:  "When moving replicas from oldMS to newMS, drop usage of MaxSurge in the newMS scale up intent when there newMS is scaling from a previous reconcile (maxSurge 3, maxUnavailable 1)",
-			md:    createMD("v6", 6, withRollingUpdateStrategy(3, 1)),
+			md:    createMD("v2", 6, withRollingUpdateStrategy(3, 1)),
 			newMS: createMS("ms2", "v2", 3, withStatusReplicas(2), withStatusUpToDateReplicas(2), withStatusAvailableReplicas(2)), // scaling from a previous reconcile
 			oldMS: []*clusterv1.MachineSet{
 				createMS("ms1", "v1", 3),
@@ -1054,7 +1054,7 @@ func TestReconcileInPlaceUpdateIntent(t *testing.T) {
 			canUpdateAnswer: map[string]bool{
 				"ms1": true,
 			},
-			expectMoveFromMS:   []string{"ms1"},
+			expectMoveFromMS: []string{"ms1"},
 			expectScaleIntents: map[string]int32{
 				// "ms2": 6, +3 replicas from maxSurge dropped, newMS is already scaling up
 			},
@@ -1068,8 +1068,8 @@ func TestReconcileInPlaceUpdateIntent(t *testing.T) {
 			},
 			machines: []*clusterv1.Machine{
 				createM("m1", "ms1", "v1"),
-				createM("m2", "ms2", "v1"),
-				createM("m3", "ms2", "v1"),
+				createM("m2", "ms2", "v2"),
+				createM("m3", "ms2", "v2"),
 			},
 			scaleIntents: map[string]int32{
 				"ms2": 3, // +1 => MD expect 3, has currently 3 replicas, +1 replica it is using maxSurge
@@ -1083,7 +1083,7 @@ func TestReconcileInPlaceUpdateIntent(t *testing.T) {
 			canUpdateAnswer: map[string]bool{
 				"ms1": true,
 			},
-			expectMoveFromMS:   []string{"ms1"},
+			expectMoveFromMS: []string{"ms1"},
 			expectScaleIntents: map[string]int32{
 				// "ms2": 1, +1 replica using maxSurge dropped, there is a machine updating in place
 			},
@@ -1112,7 +1112,7 @@ func TestReconcileInPlaceUpdateIntent(t *testing.T) {
 			canUpdateAnswer: map[string]bool{
 				"ms1": true,
 			},
-			expectMoveFromMS:   []string{"ms1"},
+			expectMoveFromMS: []string{"ms1"},
 			expectScaleIntents: map[string]int32{
 				// "ms2": 1, +1 replica using maxSurge dropped, there is a machine updating in place
 			},
@@ -1126,8 +1126,8 @@ func TestReconcileInPlaceUpdateIntent(t *testing.T) {
 			},
 			machines: []*clusterv1.Machine{
 				createM("m1", "ms1", "v1"),
-				createM("m2", "ms2", "v1"),
-				createM("m3", "ms2", "v1"),
+				createM("m2", "ms2", "v2"),
+				createM("m3", "ms2", "v2"),
 			},
 			scaleIntents: map[string]int32{
 				"ms2": 3, // +1 => MD expect 3, has currently 3 replicas, +1 replica it is using maxSurge
@@ -1141,7 +1141,7 @@ func TestReconcileInPlaceUpdateIntent(t *testing.T) {
 			canUpdateAnswer: map[string]bool{
 				"ms1": true,
 			},
-			expectMoveFromMS:   []string{"ms1"},
+			expectMoveFromMS: []string{"ms1"},
 			expectScaleIntents: map[string]int32{
 				// "ms2": 1, +1 replica using maxSurge dropped, there is a machine updating in place
 			},