github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90337 from gaurav1086/aws_use_TrimPrefix

Browse Source 
[Provider/aws] use strings.TrimPrefix()
This commit is contained in:
Kubernetes Prow Robot 2020-04-27 02:51:29 -07:00 committed by GitHub
commit cdc9e337d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
staging/src/k8s.io/legacy-cloud-providers/aws/aws.go
View File

@ -1884,12 +1884,8 @@ func (c *Cloud) getMountDevice(
volumeStatus := map[EBSVolumeID]string{} // for better logging of volume status volumeStatus := map[EBSVolumeID]string{} // for better logging of volume status
for _, blockDevice := range info.BlockDeviceMappings { for _, blockDevice := range info.BlockDeviceMappings {
name := aws.StringValue(blockDevice.DeviceName) name := aws.StringValue(blockDevice.DeviceName)
if strings.HasPrefix(name, "/dev/sd") { name = strings.TrimPrefix(name, "/dev/sd")
name = name[7:] name = strings.TrimPrefix(name, "/dev/xvd")
}
if strings.HasPrefix(name, "/dev/xvd") {
name = name[8:]
}
if len(name) < 1 || len(name) > 2 { if len(name) < 1 || len(name) > 2 {
klog.Warningf("Unexpected EBS DeviceName: %q", aws.StringValue(blockDevice.DeviceName)) klog.Warningf("Unexpected EBS DeviceName: %q", aws.StringValue(blockDevice.DeviceName))
} }