Skip to content

Commit 8b71438

Browse files
authored
Merge pull request #2762 from k8s-infra-cherrypick-robot/cherry-pick-2757-to-release-1.32
[release-1.32] chore: add minimum size for premium v2
2 parents c9f92d6 + 53741c5 commit 8b71438

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

pkg/azurefile/azurefile.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,9 @@ const (
8282
fileShareNameMinLength = 3
8383
fileShareNameMaxLength = 63
8484

85-
minimumPremiumShareSize = 100 // GB
86-
// Minimum size of Azure Premium Files is 100GiB
85+
minimumPremiumShareSize = 100 // GB
86+
minimumPremiumV2ShareSize = 32 // GB
87+
// Minimum size of Azure Premium Files is 100GiB, and PremiumV2 Files is 32GiB.
8788
// See https://docs.microsoft.com/en-us/azure/storage/files/storage-files-planning#provisioned-shares
8889
defaultAzureFileQuota = 100
8990
minimumAccountQuota = 100 // GB

pkg/azurefile/controllerserver.go

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
390390

391391
fileShareSize := int(requestGiB)
392392

393-
if account != "" && resourceGroup != "" && sku == "" && fileShareSize < minimumPremiumShareSize {
393+
if account != "" && resourceGroup != "" && sku == "" && fileShareSize < minimumPremiumV2ShareSize {
394394
if d.cloud == nil || d.cloud.ComputeClientFactory == nil {
395395
return nil, status.Errorf(codes.Internal, "cloud provider is not initialized")
396396
}
@@ -411,8 +411,14 @@ func (d *Driver) CreateVolume(ctx context.Context, req *csi.CreateVolumeRequest)
411411
accountKind := string(armstorage.KindStorageV2)
412412
if strings.HasPrefix(strings.ToLower(sku), premium) {
413413
accountKind = string(armstorage.KindFileStorage)
414-
if fileShareSize < minimumPremiumShareSize {
415-
fileShareSize = minimumPremiumShareSize
414+
if strings.Contains(strings.ToLower(sku), "v2") {
415+
if fileShareSize < minimumPremiumV2ShareSize {
416+
fileShareSize = minimumPremiumV2ShareSize
417+
}
418+
} else {
419+
if fileShareSize < minimumPremiumShareSize {
420+
fileShareSize = minimumPremiumShareSize
421+
}
416422
}
417423
}
418424

0 commit comments

Comments
 (0)