Merge pull request #62616 from andyzhangx/automated-cherry-pick-of-#62250-upstream-release-1.10

pkg/volume/azure_dd/azure_common.go

@@ -35,7 +35,6 @@ import (
 )
 
 const (
-	defaultFSType                   = "ext4"
 	defaultStorageAccountType       = storage.StandardLRS
 	defaultAzureDiskKind            = v1.AzureSharedBlobDisk
 	defaultAzureDataDiskCachingMode = v1.AzureDataDiskCachingNone
@@ -108,14 +107,6 @@ func getVolumeSource(spec *volume.Spec) (*v1.AzureDiskVolumeSource, error) {
 	return nil, fmt.Errorf("azureDisk - Spec does not reference an Azure disk volume type")
 }
 
-func normalizeFsType(fsType string) string {
-	if fsType == "" {
-		return defaultFSType
-	}
-
-	return fsType
-}
-
 func normalizeKind(kind string) (v1.AzureDataDiskKind, error) {
 	if kind == "" {
 		return defaultAzureDiskKind, nil

pkg/volume/azure_dd/azure_provision.go

@@ -121,7 +121,6 @@ func (p *azureDiskProvisioner) Provision() (*v1.PersistentVolume, error) {
 	}
 
 	// normalize values
-	fsType = normalizeFsType(fsType)
 	skuName, err := normalizeStorageAccountType(storageAccountType)
 	if err != nil {
 		return nil, err