Fix archiveOnDelete parsing

(cherry picked from commit 9b94fa6ac2)
This commit is contained in:
Matthew Wong
2020-09-07 05:49:08 +00:00
committed by kmova
parent 7c1944a9b3
commit a54ff504ef
+8 -6
View File
@@ -113,12 +113,14 @@ func (p *nfsProvisioner) Delete(volume *v1.PersistentVolume) error {
// If it exists and has a falsey value, delete the directory.
// Otherwise, archive it.
archiveOnDelete, exists := storageClass.Parameters["archiveOnDelete"]
archiveBool, err := strconv.ParseBool(archiveOnDelete)
if err != nil {
return err
}
if exists && !archiveBool {
return os.RemoveAll(oldPath)
if exists {
archiveBool, err := strconv.ParseBool(archiveOnDelete)
if err != nil {
return err
}
if !archiveBool {
return os.RemoveAll(oldPath)
}
}
archivePath := filepath.Join(mountPath, "archived-"+pvName)