Merge pull request #2435 from k8s-infra-cherrypick-robot/cherry-pick-2433-to-release-1.32

andyzhangx · web-flow · commit 726cfee2ed9f · 2025-03-19T19:47:59.000+08:00
[release-1.32] chore: fix ShareQuota nil issue
diff --git a/pkg/azurefile/azurefile.go b/pkg/azurefile/azurefile.go
@@ -1035,7 +1035,7 @@ func (d *Driver) ResizeFileShare(ctx context.Context, subsID, resourceGroup, acc
 			}
 			if ptr.Deref(fileShare.FileShareProperties.ShareQuota, 0) >= int32(sizeGiB) {
 				klog.Warningf("file share size(%dGi) is already greater or equal than requested size(%dGi), accountName: %s, shareName: %s",
-					fileShare.FileShareProperties.ShareQuota, sizeGiB, accountName, shareName)
+					ptr.Deref(fileShare.FileShareProperties.ShareQuota, 0), sizeGiB, accountName, shareName)
 				return true, nil
 			}
 			fileShare.FileShareProperties.ShareQuota = to.Ptr(int32(sizeGiB))

Original file line number	Diff line number	Diff line change
`@@ -1035,7 +1035,7 @@ func (d *Driver) ResizeFileShare(ctx context.Context, subsID, resourceGroup, acc`
`1035`	`1035`	`}`
`1036`	`1036`	`if ptr.Deref(fileShare.FileShareProperties.ShareQuota, 0) >= int32(sizeGiB) {`
`1037`	`1037`	`klog.Warningf("file share size(%dGi) is already greater or equal than requested size(%dGi), accountName: %s, shareName: %s",`
`1038`		`- fileShare.FileShareProperties.ShareQuota, sizeGiB, accountName, shareName)`
	`1038`	`+ ptr.Deref(fileShare.FileShareProperties.ShareQuota, 0), sizeGiB, accountName, shareName)`
`1039`	`1039`	`return true, nil`
`1040`	`1040`	`}`
`1041`	`1041`	`fileShare.FileShareProperties.ShareQuota = to.Ptr(int32(sizeGiB))`