Fix archiveOnDelete parsing

This commit is contained in:
Matthew Wong 2018-08-15 13:26:18 -04:00
parent f46a12bccb
commit 9b94fa6ac2
1 changed files with 8 additions and 6 deletions

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)