github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 20:53:33 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #102892 from gnufied/no-error-on-canonical-path

Browse Source 
Do not throw error when we can't get canonical path
This commit is contained in:
Kubernetes Prow Robot 2021-06-17 17:16:05 -07:00 committed by GitHub
commit 3be88d5d0f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
staging/src/k8s.io/legacy-cloud-providers/vsphere/vsphere.go
View File

@ -936,11 +936,10 @@ func (vs *VSphere) AttachDisk(vmDiskPath string, storagePolicyName string, nodeN
return "", err return "", err
} }
// try and get canonical path for disk and if we can't throw error // try and get canonical path for disk and if we can't use provided vmDiskPath
vmDiskPath, err = getcanonicalVolumePath(ctx, vm.Datacenter, vmDiskPath) canonicalPath, pathFetchErr := getcanonicalVolumePath(ctx, vm.Datacenter, vmDiskPath)
if err != nil { if canonicalPath != "" && pathFetchErr == nil {
klog.Errorf("failed to get canonical path for %s on node %s: %v", vmDiskPath, convertToString(nodeName), err) vmDiskPath = canonicalPath
return "", err
} }
diskUUID, err = vm.AttachDisk(ctx, vmDiskPath, &vclib.VolumeOptions{SCSIControllerType: vclib.PVSCSIControllerType, StoragePolicyName: storagePolicyName}) diskUUID, err = vm.AttachDisk(ctx, vmDiskPath, &vclib.VolumeOptions{SCSIControllerType: vclib.PVSCSIControllerType, StoragePolicyName: storagePolicyName})