fix: scale cannot find VM index for the VMAS+VHD+Linux case (#2906)

Azure · Mar 18, 2020 · 1ae9cca · 1ae9cca
1 parent 5b51d35
commit 1ae9cca
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 3 deletions.
diff --git a/cmd/scale.go b/cmd/scale.go
@@ -269,8 +269,7 @@ func (sc *scaleCmd) run(cmd *cobra.Command, args []string) error {
 					continue
 				}
 
-				osPublisher := vm.StorageProfile.ImageReference.Publisher
-				if osPublisher != nil && (strings.EqualFold(*osPublisher, "MicrosoftWindowsServer") || strings.EqualFold(*osPublisher, "microsoft-aks")) {
+				if sc.agentPool.OSType == api.Windows {
 					_, _, winPoolIndex, index, err = utils.WindowsVMNameParts(vmName)
 				} else {
 					_, _, index, err = utils.K8sLinuxVMNameParts(vmName)

diff --git a/test/e2e/test_cluster_configs/availabilityset.json b/test/e2e/test_cluster_configs/availabilityset.json
@@ -1,6 +1,7 @@
 {
 	"env": {
-		"CREATE_VNET": true
+		"CREATE_VNET": true,
+		"SCALE_CLUSTER": true
 	},
 	"apiModel": {
 		"apiVersion": "vlabs",
@@ -43,6 +44,7 @@
 					"name": "agent1",
 					"count": 3,
 					"vmSize": "Standard_D2_v3",
+					"osType": "Linux",
 					"OSDiskSizeGB": 200,
 					"storageProfile": "ManagedDisks",
 					"diskSizesGB": [
@@ -51,6 +53,16 @@
 					],
 					"availabilityProfile": "AvailabilitySet",
 					"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME"
+				},
+				{
+					"name": "poolwin",
+					"count": 2,
+					"vmSize": "Standard_D2_v3",
+					"osType": "Windows",
+					"OSDiskSizeGB": 200,
+					"storageProfile": "ManagedDisks",
+					"availabilityProfile": "AvailabilitySet",
+					"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/SUBNET_NAME"
 				}
 			],
 			"linuxProfile": {
@@ -63,6 +75,12 @@
 					]
 				}
 			},
+			"windowsProfile": {
+				"adminUsername": "azureuser",
+				"adminPassword": "replacepassword1234$",
+				"enableAutomaticUpdates": false,
+				"sshEnabled": true
+			},
 			"servicePrincipalProfile": {
 				"clientId": "",
 				"secret": ""