Merge pull request #100500 from jsafrane/aws-nvme-partitions

Fix mounting partitions on NVMe devices
This commit is contained in:
Kubernetes Prow Robot 2021-04-08 22:10:24 -07:00 committed by GitHub
commit 77e73ffbee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -41,8 +41,9 @@ import (
) )
const ( const (
diskPartitionSuffix = "" diskPartitionSuffix = ""
checkSleepDuration = time.Second nvmeDiskPartitionSuffix = "p"
checkSleepDuration = time.Second
) )
// AWSDiskUtil provides operations for EBS volume. // AWSDiskUtil provides operations for EBS volume.
@ -240,6 +241,9 @@ func getDiskByIDPaths(volumeID aws.KubernetesVolumeID, partition string, deviceP
if err != nil { if err != nil {
klog.Warningf("error looking for nvme volume %q: %v", volumeID, err) klog.Warningf("error looking for nvme volume %q: %v", volumeID, err)
} else if nvmePath != "" { } else if nvmePath != "" {
if partition != "" {
nvmePath = nvmePath + nvmeDiskPartitionSuffix + partition
}
devicePaths = append(devicePaths, nvmePath) devicePaths = append(devicePaths, nvmePath)
} }
} }