From a54ff504ef794ef181e586dcdeca060304968b12 Mon Sep 17 00:00:00 2001
From: Matthew Wong <mawong@redhat.com>
Date: Wed, 15 Aug 2018 13:26:18 -0400
Subject: [PATCH] Fix archiveOnDelete parsing

(cherry picked from commit 9b94fa6ac252e8e43f5a2d77b597b7013253a121)
---
 cmd/nfs-client-provisioner/provisioner.go | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/cmd/nfs-client-provisioner/provisioner.go b/cmd/nfs-client-provisioner/provisioner.go
index eab741f0..f7b3a559 100644
--- a/cmd/nfs-client-provisioner/provisioner.go
+++ b/cmd/nfs-client-provisioner/provisioner.go
@@ -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)