Skip to content

K
k3s
Unverified Commit da5d9cab authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #62825 from andyzhangx/automated-cherry-pick-of-#61267-upstream-release-1.10

Automatic merge from submit-queue. Automated cherry pick of #61267: respect fstype in Windows for azure disk Cherry pick of #61267 on release-1.10. #61267: respect fstype in Windows for azure disk
parents fa98d74e ed43056a
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
pkg/volume/azure_dd/azure_common_windows.go
View file @ da5d9cab
...@@ -103,8 +103,12 @@ func formatIfNotFormatted(disk string, fstype string, exec mount.Exec) { ...@@ -103,8 +103,12 @@ func formatIfNotFormatted(disk string, fstype string, exec mount.Exec) {
return return
} }
if len(fstype) == 0 {
// Use 'NTFS' as the default
fstype = "NTFS"
}
cmd := fmt.Sprintf("Get-Disk -Number %s | Where partitionstyle -eq 'raw' | Initialize-Disk -PartitionStyle MBR -PassThru", disk) cmd := fmt.Sprintf("Get-Disk -Number %s | Where partitionstyle -eq 'raw' | Initialize-Disk -PartitionStyle MBR -PassThru", disk)
cmd += " | New-Partition -AssignDriveLetter -UseMaximumSize | Format-Volume -FileSystem NTFS -Confirm:$false" cmd += fmt.Sprintf(" | New-Partition -AssignDriveLetter -UseMaximumSize | Format-Volume -FileSystem %s -Confirm:$false", fstype)
output, err := exec.Run("powershell", "/c", cmd) output, err := exec.Run("powershell", "/c", cmd)
if err != nil { if err != nil {
glog.Errorf("azureDisk Mount: Get-Disk failed, error: %v, output: %q", err, string(output)) glog.Errorf("azureDisk Mount: Get-Disk failed, error: %v, output: %q", err, string(output))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment