DO NOT MERGE more installer patching to make tests pass

Author: dlom

pkg/controller/machinepool/azureactuator_test.go

@@ -197,9 +197,9 @@ func TestAzureActuator(t *testing.T) {
 				generateAzureMachineSetName("zone2"): 1,
 				generateAzureMachineSetName("zone3"): 1,
 			},
-			// V1 image is chosen for machinepool
+			// Empty image is chosen for machinepool, and MAO will decide
 			expectedImage: &machineapi.Image{
-				ResourceID: "/resourceGroups/foo-12345-rg/providers/Microsoft.Compute/galleries/gallery_foo_12345/images/foo-12345/versions/latest",
+				ResourceID: "",
 			},
 		},
 		{
@@ -216,9 +216,9 @@ func TestAzureActuator(t *testing.T) {
 				generateAzureMachineSetName("zone2"): 1,
 				generateAzureMachineSetName("zone3"): 1,
 			},
-			// V1 image is chosen for machinepool
+			// Empty image is chosen for machinepool, and MAO will decide
 			expectedImage: &machineapi.Image{
-				ResourceID: "/resourceGroups/foo-12345-rg/providers/Microsoft.Compute/galleries/gallery_foo_12345/images/foo-12345/versions/latest",
+				ResourceID: "",
 			},
 		},
 		{
@@ -235,9 +235,9 @@ func TestAzureActuator(t *testing.T) {
 				generateAzureMachineSetName("zone2"): 1,
 				generateAzureMachineSetName("zone3"): 1,
 			},
-			// V2 ("-gen2") image is chosen for machinepool
+			// Empty image is chosen for machinepool, and MAO will decide
 			expectedImage: &machineapi.Image{
-				ResourceID: "/resourceGroups/foo-12345-rg/providers/Microsoft.Compute/galleries/gallery_foo_12345/images/foo-12345-gen2/versions/latest",
+				ResourceID: "",
 			},
 		},
 		{
@@ -254,9 +254,9 @@ func TestAzureActuator(t *testing.T) {
 				generateAzureMachineSetName("zone2"): 1,
 				generateAzureMachineSetName("zone3"): 1,
 			},
-			// V2 ("-gen2") image is chosen for machinepool
+			// Empty image is chosen for machinepool, and MAO will decide
 			expectedImage: &machineapi.Image{
-				ResourceID: "/resourceGroups/foo-12345-rg/providers/Microsoft.Compute/galleries/gallery_foo_12345/images/foo-12345-gen2/versions/latest",
+				ResourceID: "",
 			},
 		},
 		{

pkg/installmanager/testdata/install-config-with-existing-pull-secret.yaml

@@ -7,6 +7,7 @@ compute:
         rootVolume:
           iops: 100
           size: 120
+          throughput: 0
           type: gp3
         type: m5.xlarge
     replicas: 3
@@ -18,6 +19,7 @@ controlPlane:
       rootVolume:
         iops: 100
         size: 120
+        throughput: 0
         type: gp3
       type: m5.xlarge
   replicas: 3

pkg/installmanager/testdata/install-config.yaml

@@ -7,6 +7,7 @@ compute:
         rootVolume:
           iops: 100
           size: 120
+          throughput: 0
           type: gp3
         type: m5.xlarge
     replicas: 3
@@ -18,6 +19,7 @@ controlPlane:
       rootVolume:
         iops: 100
         size: 120
+        throughput: 0
         type: gp3
       type: m5.xlarge
   replicas: 3