Merge pull request #1492 from jackfrancis/singleplacementgroup-false

SinglePlacementGroup=false for Azure VMSS (MachinePool)

Author: k8s-ci-robot

azure/converters/vmss_test.go

@@ -52,7 +52,8 @@ func Test_SDKToVMSS(t *testing.T) {
 						Location: to.StringPtr("westus2"),
 						Tags:     tags,
 						VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
-							ProvisioningState: to.StringPtr(string(compute.ProvisioningState1Succeeded)),
+							SinglePlacementGroup: to.BoolPtr(false),
+							ProvisioningState:    to.StringPtr(string(compute.ProvisioningState1Succeeded)),
 						},
 					},
 					[]compute.VirtualMachineScaleSetVM{

azure/services/scalesets/scalesets.go

@@ -387,6 +387,7 @@ func (s *Service) buildVMSSFromSpec(ctx context.Context, vmssSpec azure.ScaleSet
 		Zones: to.StringSlicePtr(vmssSpec.FailureDomains),
 		Plan:  s.generateImagePlan(),
 		VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
+			SinglePlacementGroup: to.BoolPtr(false),
 			UpgradePolicy: &compute.UpgradePolicy{
 				Mode: compute.UpgradeModeManual,
 			},

azure/services/scalesets/scalesets_test.go

@@ -150,7 +150,8 @@ func TestGetExistingVMSS(t *testing.T) {
 						Name:     to.StringPtr("Standard_D2"),
 					},
 					VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
-						ProvisioningState: to.StringPtr("Succeeded"),
+						SinglePlacementGroup: to.BoolPtr(false),
+						ProvisioningState:    to.StringPtr("Succeeded"),
 					},
 					Zones: &[]string{"1", "3"},
 				}, nil)
@@ -182,7 +183,8 @@ func TestGetExistingVMSS(t *testing.T) {
 					ID:   to.StringPtr("my-id"),
 					Name: to.StringPtr("my-vmss"),
 					VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
-						ProvisioningState: to.StringPtr("Succeeded"),
+						SinglePlacementGroup: to.BoolPtr(false),
+						ProvisioningState:    to.StringPtr("Succeeded"),
 					},
 				}, nil)
 				m.ListInstances(gomockinternal.AContext(), "my-rg", "my-vmss").Return([]compute.VirtualMachineScaleSetVM{}, autorest.NewErrorWithResponse("", "", &http.Response{StatusCode: 404}, "Not found"))
@@ -853,6 +855,7 @@ func newDefaultVMSS() compute.VirtualMachineScaleSet {
 		},
 		Zones: &[]string{"1", "3"},
 		VirtualMachineScaleSetProperties: &compute.VirtualMachineScaleSetProperties{
+			SinglePlacementGroup: to.BoolPtr(false),
 			UpgradePolicy: &compute.UpgradePolicy{
 				Mode: compute.UpgradeModeManual,
 			},