Skip to content

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

Merge pull request #40538 from vmware/fixvSphereDeleteVolume

Automatic merge from submit-queue Adding vmdk file extension for vmDiskPath in vsphere DeleteVolume **What this PR does / why we need it**: This fix is required to handle situation when volume path is not set with vmdk file extension. DiskAttach call does not require vmdk file extension to be explicitly set in the file path, so in PV yaml file, users have option to set such file path. Issue happens when such PV is created with persistentVolumeReclaimPolicy set to Delete, and user deletes associated PVC. Volume deletion will fail with the message: file was not found **Which issue this PR fixes** * Fixes: #40560 **Special notes for your reviewer**: Tested fix with custom image: divyen/hyperkube-fix-deletevolume:latest (Image built using base v1.5.3-beta.0) @kerneltime @BaluDontu please review this fix.
parents f1cd8508 7baa1c73
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 0 deletions
pkg/cloudprovider/providers/vsphere/vsphere.go
View file @ 5b88f0e1
...@@ -1286,6 +1286,9 @@ func (vs *VSphere) DeleteVolume(vmDiskPath string) error { ...@@ -1286,6 +1286,9 @@ func (vs *VSphere) DeleteVolume(vmDiskPath string) error {
// Create a virtual disk manager // Create a virtual disk manager
virtualDiskManager := object.NewVirtualDiskManager(vs.client.Client) virtualDiskManager := object.NewVirtualDiskManager(vs.client.Client)
if filepath.Ext(vmDiskPath) != ".vmdk" {
vmDiskPath += ".vmdk"
}
// Delete virtual disk // Delete virtual disk
task, err := virtualDiskManager.DeleteVirtualDisk(ctx, vmDiskPath, dc) task, err := virtualDiskManager.DeleteVirtualDisk(ctx, vmDiskPath, dc)
if err != nil { if err != nil {
......
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