Merge pull request #325 from songjiaxun/azurestack_support_premium

fix: Azure Stack supports Premium_LRS storage account type

Author: k8s-ci-robot

docs/limitations.md

@@ -1,6 +1,6 @@
 # Azure Blob Storage CSI Driver Limitations
  - Although Blob CSI Driver allows ReadWriteMany access mode to be used, its functionality is limited by the underlying volume-mounting technology. If azure-storage-fuse is being used to mount a Blob storage container, multiple nodes are allowed to mount the same container, but for just read-only scenarios. It means, you can still use ReadWriteMany mode to claim a volume, but you should carefully avoid writing to one single file from multiple nodes as there will be data corruption. NFSv3, in the contrast, fully supports ReadWriteMany access mode.
  - The azure-storage-fuse method only supports Linux agent nodes.
- - For the Kubernetes clusters that are running on Azure Stack Hub environments, only Standard Locally-redundant storage (Standard_LRS) Storage Account is supported. You will not be blocked if you claim a volume with other types of Storage Account, however, under the hood the account type will be converted to Standard_LRS.
+ - For the Kubernetes clusters that are running on Azure Stack Hub environments, only Standard Locally-redundant (Standard_LRS) and Premium Locally-redundant (Premium_LRS) Storage Account types are supported.
  - The memory consumption of azure-storage-fuse (blobfuse) may be high when large files are being processed. Thus, by default the Blob CSI Driver container has a memory restriction of 2100Mi. This known issue is described in [this ticket](https://github.com/Azure/azure-storage-fuse/issues/454).
  - Restart csi-blobfuse-node daemonset would make current blobfuse mount unavailable. This issue is tracked by [this ticket](https://github.com/kubernetes-sigs/blob-csi-driver/issues/115).

pkg/blob/controllerserver.go

@@ -114,7 +114,9 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
 	}
 	if IsAzureStackCloud(d.cloud) {
 		accountKind = string(storage.Storage)
-		storageAccountType = "Standard_LRS"
+		if storageAccountType != "" && storageAccountType != string(storage.StandardLRS) && storageAccountType != string(storage.PremiumLRS) {
+			return nil, status.Errorf(codes.InvalidArgument, fmt.Sprintf("Invalid skuName value: %s, as Azure Stack only supports %s and %s Storage Account types.", storageAccountType, storage.PremiumLRS, storage.StandardLRS))
+		}
 	}
 
 	tags, err := azure.ConvertTagsToMap(customTags)

test/e2e/dynamic_provisioning_test.go

@@ -136,6 +136,13 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
 			Pods:                   pods,
 			StorageClassParameters: map[string]string{"skuName": "Standard_GRS"},
 		}
+		if isAzureStackCloud {
+			test = testsuites.DynamicallyProvisionedReadOnlyVolumeTest{
+				CSIDriver:              testDriver,
+				Pods:                   pods,
+				StorageClassParameters: map[string]string{"skuName": "Standard_LRS"},
+			}
+		}
 		test.Run(cs, ns)
 	})
 
@@ -174,6 +181,14 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
 			ColocatePods:           true,
 			StorageClassParameters: map[string]string{"skuName": "Standard_RAGRS"},
 		}
+		if isAzureStackCloud {
+			test = testsuites.DynamicallyProvisionedCollocatedPodTest{
+				CSIDriver:              testDriver,
+				Pods:                   pods,
+				ColocatePods:           true,
+				StorageClassParameters: map[string]string{"skuName": "Standard_LRS"},
+			}
+		}
 		test.Run(cs, ns)
 	})
 
@@ -209,6 +224,14 @@ var _ = ginkgo.Describe("[blob-csi-e2e] Dynamic Provisioning", func() {
 			Driver:                 blobDriver,
 			StorageClassParameters: map[string]string{"skuName": "Standard_GRS"},
 		}
+		if isAzureStackCloud {
+			test = testsuites.DynamicallyProvisionedReclaimPolicyTest{
+				CSIDriver:              testDriver,
+				Volumes:                volumes,
+				Driver:                 blobDriver,
+				StorageClassParameters: map[string]string{"skuName": "Standard_LRS"},
+			}
+		}
 		test.Run(cs, ns)
 	})
 

test/e2e/suite_test.go

@@ -46,6 +46,7 @@ const (
 	defaultReportDir = "/workspace/_artifacts"
 )
 
+var isAzureStackCloud = strings.EqualFold(os.Getenv("AZURE_CLOUD_NAME"), "AZURESTACKCLOUD")
 var blobDriver *blob.Driver
 
 var bringKeyStorageClassParameters = map[string]string{

test/e2e/testsuites/specs.go

@@ -18,6 +18,8 @@ package testsuites
 
 import (
 	"fmt"
+	"os"
+	"strings"
 
 	"sigs.k8s.io/blob-csi-driver/test/e2e/driver"
 
@@ -64,7 +66,9 @@ const (
 )
 
 var (
-	supportedStorageAccountTypes = []string{"Standard_LRS", "Premium_LRS", "Standard_GRS", "Standard_RAGRS"}
+	isAzureStackCloud                            = strings.EqualFold(os.Getenv("AZURE_CLOUD_NAME"), "AZURESTACKCLOUD")
+	azurePublicCloudSupportedStorageAccountTypes = []string{"Standard_LRS", "Premium_LRS", "Standard_GRS", "Standard_RAGRS"}
+	azureStackCloudSupportedStorageAccountTypes  = []string{"Standard_LRS", "Premium_LRS"}
 )
 
 type VolumeMountDetails struct {
@@ -101,6 +105,10 @@ func (pod *PodDetails) SetupWithDynamicVolumes(client clientset.Interface, names
 func (pod *PodDetails) SetupWithDynamicMultipleVolumes(client clientset.Interface, namespace *v1.Namespace, csiDriver driver.DynamicPVTestDriver) (*TestPod, []func()) {
 	tpod := NewTestPod(client, namespace, pod.Cmd)
 	cleanupFuncs := make([]func(), 0)
+	supportedStorageAccountTypes := azurePublicCloudSupportedStorageAccountTypes
+	if isAzureStackCloud {
+		supportedStorageAccountTypes = azureStackCloudSupportedStorageAccountTypes
+	}
 	accountTypeCount := len(supportedStorageAccountTypes)
 	for n, v := range pod.Volumes {
 		storageClassParameters := map[string]string{"skuName": supportedStorageAccountTypes[n%accountTypeCount]}