[release-1.31] Chore: set batch size to great or equal to 1

pkg/provider/azure_vmss.go

@@ -2316,6 +2316,9 @@ func (ss *ScaleSet) VMSSBatchSize(ctx context.Context, vmssName string) (int, er
 	if _, ok := vmss.Tags[consts.VMSSTagForBatchOperation]; ok {
 		batchSize = ss.GetPutVMSSVMBatchSize()
 	}
+	if batchSize < 1 {
+		batchSize = 1
+	}
 	klog.V(2).InfoS("Fetch VMSS batch size", "vmss", vmssName, "size", batchSize)
 	return batchSize, nil
 }

pkg/provider/azure_vmss_test.go

@@ -3297,6 +3297,31 @@
 		assert.Equal(t, BatchSize, batchSize)
 	})
 
+	t.Run("vmss contains batch operation tag", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+		ss, err := NewTestScaleSet(ctrl)
+		assert.NoError(t, err)
+		ss.Cloud.PutVMSSVMBatchSize = 0
+
+		scaleSet := &armcompute.VirtualMachineScaleSet{
+			Name: ptr.To("foo"),
+			Tags: map[string]*string{
+				consts.VMSSTagForBatchOperation: ptr.To(""),
+			},
+			Properties: &armcompute.VirtualMachineScaleSetProperties{
+				OrchestrationMode: to.Ptr(armcompute.OrchestrationModeUniform),
+			},
+		}
+		mockVMSSClient := ss.Cloud.ComputeClientFactory.GetVirtualMachineScaleSetClient().(*mock_virtualmachinescalesetclient.MockInterface)
+		mockVMSSClient.EXPECT().List(gomock.Any(), gomock.Any()).
+			Return([]*armcompute.VirtualMachineScaleSet{scaleSet}, nil)
+
+		batchSize, err := ss.VMSSBatchSize(context.TODO(), ptr.Deref(scaleSet.Name, ""))
+		assert.NoError(t, err)
+		assert.Equal(t, 1, batchSize)
+	})
+
 	t.Run("vmss doesn't contain batch operation tag", func(t *testing.T) {
 		ctrl := gomock.NewController(t)
 		defer ctrl.Finish()

pkg/provider/config/azure.go

@@ -133,7 +133,7 @@ type Config struct {
 	// `podIP`: pod IPs will be attached to the inbound backend pool of the load balancer (not supported yet).
 	LoadBalancerBackendPoolConfigurationType string `json:"loadBalancerBackendPoolConfigurationType,omitempty" yaml:"loadBalancerBackendPoolConfigurationType,omitempty"`
 	// PutVMSSVMBatchSize defines how many requests the client send concurrently when putting the VMSS VMs.
-	// If it is smaller than or equal to zero, the request will be sent one by one in sequence (default).
+	// If it is smaller than or equal to one, the request will be sent one by one in sequence (default).
 	PutVMSSVMBatchSize int `json:"putVMSSVMBatchSize" yaml:"putVMSSVMBatchSize"`
 	// PrivateLinkServiceResourceGroup determines the specific resource group of the private link services user want to use
 	PrivateLinkServiceResourceGroup string `json:"privateLinkServiceResourceGroup,omitempty" yaml:"privateLinkServiceResourceGroup,omitempty"`