feat: add PickRandomMatchingAccount in account search

pkg/provider/azure_managedDiskController.go

@@ -76,6 +76,8 @@ type ManagedDiskOptions struct {
 	LogicalSectorSize int32
 	// SkipGetDiskOperation indicates whether skip GetDisk operation(mainly due to throttling)
 	SkipGetDiskOperation bool
+	// PublicNetworkAccess - Possible values include: 'Enabled', 'Disabled'
+	PublicNetworkAccess compute.PublicNetworkAccess
 	// NetworkAccessPolicy - Possible values include: 'AllowAll', 'AllowPrivate', 'DenyAll'
 	NetworkAccessPolicy compute.NetworkAccessPolicy
 	// DiskAccessID - ARM id of the DiskAccess resource for using private endpoints on disks.
@@ -139,6 +141,10 @@ func (c *ManagedDiskController) CreateManagedDisk(ctx context.Context, options *
 		BurstingEnabled: options.BurstingEnabled,
 	}
 
+	if options.PublicNetworkAccess != "" {
+		diskProperties.PublicNetworkAccess = options.PublicNetworkAccess
+	}
+
 	if options.NetworkAccessPolicy != "" {
 		diskProperties.NetworkAccessPolicy = options.NetworkAccessPolicy
 		if options.NetworkAccessPolicy == compute.AllowPrivate {

pkg/provider/azure_managedDiskController_test.go

@@ -65,6 +65,7 @@ func TestCreateManagedDisk(t *testing.T) {
 		diskEncryptionType  string
 		subscriptionID      string
 		resouceGroup        string
+		publicNetworkAccess compute.PublicNetworkAccess
 		networkAccessPolicy compute.NetworkAccessPolicy
 		diskAccessID        *string
 		expectedDiskID      string
@@ -204,6 +205,7 @@ func TestCreateManagedDisk(t *testing.T) {
 			storageAccountType:  compute.StandardLRS,
 			diskEncryptionSetID: goodDiskEncryptionSetID,
 			networkAccessPolicy: compute.DenyAll,
+			publicNetworkAccess: compute.Disabled,
 			expectedDiskID:      disk1ID,
 			existedDisk:         compute.Disk{ID: pointer.String(disk1ID), Name: pointer.String(disk1Name), DiskProperties: &compute.DiskProperties{Encryption: &compute.Encryption{DiskEncryptionSetID: &goodDiskEncryptionSetID, Type: compute.EncryptionTypeEncryptionAtRestWithCustomerKey}, ProvisioningState: pointer.String("Succeeded")}, Tags: testTags},
 			expectedErr:         false,
@@ -216,6 +218,7 @@ func TestCreateManagedDisk(t *testing.T) {
 			diskEncryptionSetID: goodDiskEncryptionSetID,
 			diskEncryptionType:  "EncryptionAtRestWithCustomerKey",
 			networkAccessPolicy: compute.AllowAll,
+			publicNetworkAccess: compute.Enabled,
 			expectedDiskID:      disk1ID,
 			existedDisk:         compute.Disk{ID: pointer.String(disk1ID), Name: pointer.String(disk1Name), DiskProperties: &compute.DiskProperties{Encryption: &compute.Encryption{DiskEncryptionSetID: &goodDiskEncryptionSetID, Type: compute.EncryptionTypeEncryptionAtRestWithCustomerKey}, ProvisioningState: pointer.String("Succeeded")}, Tags: testTags},
 			expectedErr:         false,
@@ -274,6 +277,7 @@ func TestCreateManagedDisk(t *testing.T) {
 			DiskEncryptionType:  test.diskEncryptionType,
 			MaxShares:           maxShare,
 			NetworkAccessPolicy: test.networkAccessPolicy,
+			PublicNetworkAccess: test.publicNetworkAccess,
 			DiskAccessID:        test.diskAccessID,
 			SubscriptionID:      test.subscriptionID,
 		}

pkg/provider/azure_storageaccount.go

@@ -18,7 +18,9 @@ package provider
 
 import (
 	"context"
+	"crypto/rand"
 	"fmt"
+	"math/big"
 	"strings"
 
 	"github.com/Azure/azure-sdk-for-go/services/network/mgmt/2022-07-01/network"
@@ -75,6 +77,8 @@ type AccountOptions struct {
 	EnableBlobVersioning                    *bool
 	SoftDeleteBlobs                         int32
 	SoftDeleteContainers                    int32
+	// indicate whether to get a random matching account, if false, will get the first matching account
+	PickRandomMatchingAccount bool
 }
 
 type accountWithLocation struct {
@@ -212,7 +216,17 @@ func (az *Cloud) EnsureStorageAccount(ctx context.Context, accountOptions *Accou
 			}
 
 			if len(accounts) > 0 {
-				accountName = accounts[0].Name
+				index := 0
+				if accountOptions.PickRandomMatchingAccount {
+					// randomly pick one matching account
+					n, err := rand.Int(rand.Reader, big.NewInt(int64(len(accounts))))
+					if err != nil || n == nil {
+						return "", "", err
+					}
+					index = int(n.Int64())
+					klog.V(4).Infof("randomly pick one matching account, index: %d", index)
+				}
+				accountName = accounts[index].Name
 				createNewAccount = false
 				klog.V(4).Infof("found a matching account %s type %s location %s", accounts[0].Name, accounts[0].StorageType, accounts[0].Location)
 			}

pkg/provider/azure_storageaccount_test.go

@@ -378,6 +378,7 @@ func TestEnsureStorageAccount(t *testing.T) {
 		SubnetPropertiesFormatNil       bool
 		mockStorageAccountsClient       bool
 		setAccountOptions               bool
+		pickRandomMatchingAccount       bool
 		accessTier                      string
 		storageType                     StorageType
 		requireInfrastructureEncryption *bool
@@ -393,6 +394,7 @@ func TestEnsureStorageAccount(t *testing.T) {
 			createPrivateEndpoint:           true,
 			mockStorageAccountsClient:       true,
 			setAccountOptions:               true,
+			pickRandomMatchingAccount:       true,
 			storageType:                     StorageTypeBlob,
 			requireInfrastructureEncryption: pointer.Bool(true),
 			keyVaultURL:                     pointer.String("keyVaultURL"),
@@ -502,16 +504,17 @@ func TestEnsureStorageAccount(t *testing.T) {
 		var testAccountOptions *AccountOptions
 		if test.setAccountOptions {
 			testAccountOptions = &AccountOptions{
-				ResourceGroup:         test.resourceGroup,
-				CreatePrivateEndpoint: test.createPrivateEndpoint,
-				Name:                  test.accountName,
-				CreateAccount:         test.createAccount,
-				SubscriptionID:        test.subscriptionID,
-				AccessTier:            test.accessTier,
-				StorageType:           test.storageType,
-				EnableBlobVersioning:  pointer.Bool(true),
-				SoftDeleteBlobs:       7,
-				SoftDeleteContainers:  7,
+				ResourceGroup:             test.resourceGroup,
+				CreatePrivateEndpoint:     test.createPrivateEndpoint,
+				Name:                      test.accountName,
+				CreateAccount:             test.createAccount,
+				SubscriptionID:            test.subscriptionID,
+				AccessTier:                test.accessTier,
+				StorageType:               test.storageType,
+				EnableBlobVersioning:      pointer.Bool(true),
+				SoftDeleteBlobs:           7,
+				SoftDeleteContainers:      7,
+				PickRandomMatchingAccount: test.pickRandomMatchingAccount,
 			}
 		}