Merge pull request #1928 from k8s-infra-cherrypick-robot/cherry-pick-1927-to-release-1.26

[release-1.26] fix: storageEndPointSuffix setting in on-prem cluster

Author: andyzhangx

pkg/blob/blob.go

@@ -30,7 +30,6 @@ import (
 
 	"github.com/Azure/azure-sdk-for-go/sdk/resourcemanager/storage/armstorage"
 	azstorage "github.com/Azure/azure-sdk-for-go/storage"
-	az "github.com/Azure/go-autorest/autorest/azure"
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	grpcprom "github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus"
 	"github.com/pborman/uuid"
@@ -871,12 +870,12 @@ func getStorageAccount(secrets map[string]string) (string, string, error) {
 	return accountName, accountKey, nil
 }
 
-func getContainerReference(containerName string, secrets map[string]string, env az.Environment) (*azstorage.Container, error) {
+func getContainerReference(containerName string, secrets map[string]string, storageEndpointSuffix string) (*azstorage.Container, error) {
 	accountName, accountKey, rerr := getStorageAccount(secrets)
 	if rerr != nil {
 		return nil, rerr
 	}
-	client, err := azstorage.NewBasicClientOnSovereignCloud(accountName, accountKey, env)
+	client, err := azstorage.NewClient(accountName, accountKey, storageEndpointSuffix, azstorage.DefaultAPIVersion, true)
 	if err != nil {
 		return nil, err
 	}

pkg/blob/blob_test.go

@@ -892,7 +892,7 @@ func TestGetStorageAccount(t *testing.T) {
 // needs editing, could only get past first error for testing, could not get a fake environment running
 func TestGetContainerReference(t *testing.T) {
 	fakeAccountName := "storageaccountname"
-	fakeAccountKey := "test-key"
+	fakeAccountKey := "dGVzdC1rZXkK"
 	fakeContainerName := "test-con"
 	testCases := []struct {
 		name           string
@@ -946,14 +946,8 @@ func TestGetContainerReference(t *testing.T) {
 
 	for _, tc := range testCases {
 		t.Run(tc.name, func(t *testing.T) {
-			d.cloud.Environment.StorageEndpointSuffix = tc.endpointSuffix
-			container, err := getContainerReference(tc.containerName, tc.secrets, d.getCloudEnvironment())
-			if tc.expectedError != nil {
-				assert.Error(t, err)
-				assert.Equal(t, tc.expectedError, err)
-			} else {
-				container.Name = ""
-			}
+			_, err := getContainerReference(tc.containerName, tc.secrets, tc.endpointSuffix)
+			assert.Equal(t, tc.expectedError, err)
 		})
 	}
 }

pkg/blob/controllerserver.go

@@ -440,7 +440,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	}
 
 	klog.V(2).Infof("begin to create container(%s) on account(%s) type(%s) subsID(%s) rg(%s) location(%s) size(%d)", validContainerName, accountName, storageAccountType, subsID, resourceGroup, location, requestGiB)
-	if err := d.CreateBlobContainer(ctx, subsID, resourceGroup, accountName, validContainerName, secrets); err != nil {
+	if err := d.CreateBlobContainer(ctx, subsID, resourceGroup, accountName, validContainerName, storageEndpointSuffix, secrets); err != nil {
 		return nil, status.Errorf(codes.Internal, "failed to create container(%s) on account(%s) type(%s) rg(%s) location(%s) size(%d), error: %v", validContainerName, accountName, storageAccountType, resourceGroup, location, requestGiB, err)
 	}
 	if volContentSource != nil {
@@ -577,7 +577,7 @@ func (d *Driver) ValidateVolumeCapabilities(ctx context.Context, req *csi.Valida
 	var exist bool
 	secrets := req.GetSecrets()
 	if len(secrets) > 0 {
-		container, err := getContainerReference(containerName, secrets, d.getCloudEnvironment())
+		container, err := getContainerReference(containerName, secrets, d.getStorageEndPointSuffix())
 		if err != nil {
 			return nil, status.Error(codes.Internal, err.Error())
 		}
@@ -694,14 +694,14 @@ func (d *Driver) ControllerExpandVolume(_ context.Context, req *csi.ControllerEx
 }
 
 // CreateBlobContainer creates a blob container
-func (d *Driver) CreateBlobContainer(ctx context.Context, subsID, resourceGroupName, accountName, containerName string, secrets map[string]string) error {
+func (d *Driver) CreateBlobContainer(ctx context.Context, subsID, resourceGroupName, accountName, containerName, storageEndpointSuffix string, secrets map[string]string) error {
 	if containerName == "" {
 		return fmt.Errorf("containerName is empty")
 	}
 	return wait.ExponentialBackoff(getBackOff(d.cloud.Config), func() (bool, error) {
 		var err error
 		if len(secrets) > 0 {
-			container, getErr := getContainerReference(containerName, secrets, d.getCloudEnvironment())
+			container, getErr := getContainerReference(containerName, secrets, storageEndpointSuffix)
 			if getErr != nil {
 				return true, getErr
 			}
@@ -740,7 +740,7 @@ func (d *Driver) DeleteBlobContainer(ctx context.Context, subsID, resourceGroupN
 	return wait.ExponentialBackoff(getBackOff(d.cloud.Config), func() (bool, error) {
 		var err error
 		if len(secrets) > 0 {
-			container, getErr := getContainerReference(containerName, secrets, d.getCloudEnvironment())
+			container, getErr := getContainerReference(containerName, secrets, d.getStorageEndPointSuffix())
 			if getErr != nil {
 				return true, getErr
 			}

pkg/blob/controllerserver_test.go

@@ -1423,7 +1423,7 @@ func TestCreateBlobContainer(t *testing.T) {
 				}
 				return nil, nil
 			}).AnyTimes()
-		err := d.CreateBlobContainer(context.Background(), test.subsID, test.rg, test.accountName, test.containerName, test.secrets)
+		err := d.CreateBlobContainer(context.Background(), test.subsID, test.rg, test.accountName, test.containerName, "core.windows.net", test.secrets)
 		if !reflect.DeepEqual(err, test.expectedErr) {
 			t.Errorf("test(%s), actualErr: (%v), expectedErr: (%v)", test.desc, err, test.expectedErr)
 		}