honor the framework delete timeout for pv

This commit is contained in:
Saikat Roychowdhury 2022-05-03 05:23:28 +00:00
parent e7a2ce75e5
commit c208a7b753
2 changed files with 2 additions and 2 deletions

View File

@ -31,7 +31,7 @@ const (
pvReclaimTimeout = 3 * time.Minute pvReclaimTimeout = 3 * time.Minute
pvBoundTimeout = 3 * time.Minute pvBoundTimeout = 3 * time.Minute
pvCreateTimeout = 3 * time.Minute pvCreateTimeout = 3 * time.Minute
pvDeleteTimeout = 3 * time.Minute pvDeleteTimeout = 5 * time.Minute
pvDeleteSlowTimeout = 20 * time.Minute pvDeleteSlowTimeout = 20 * time.Minute
snapshotCreateTimeout = 5 * time.Minute snapshotCreateTimeout = 5 * time.Minute
snapshotDeleteTimeout = 5 * time.Minute snapshotDeleteTimeout = 5 * time.Minute

View File

@ -204,7 +204,7 @@ func (r *VolumeResource) CleanupResource() error {
} }
if pv != nil { if pv != nil {
err = e2epv.WaitForPersistentVolumeDeleted(f.ClientSet, pv.Name, 5*time.Second, 5*time.Minute) err = e2epv.WaitForPersistentVolumeDeleted(f.ClientSet, pv.Name, 5*time.Second, f.Timeouts.PVDelete)
if err != nil { if err != nil {
cleanUpErrs = append(cleanUpErrs, fmt.Errorf( cleanUpErrs = append(cleanUpErrs, fmt.Errorf(
"persistent Volume %v not deleted by dynamic provisioner: %w", pv.Name, err)) "persistent Volume %v not deleted by dynamic provisioner: %w", pv.Name, err))