e2e: delete NFS StorageClass in case it already exists

Signed-off-by: Niels de Vos <ndevos@ibm.com>

Author: nixpanic

e2e/nfs.go

@@ -221,7 +221,12 @@ func createNFSStorageClass(
 		if err != nil {
 			framework.Logf("error creating StorageClass %q: %v", sc.Name, err)
 			if apierrs.IsAlreadyExists(err) {
-				return true, nil
+				err = deleteResource(nfsExamplePath + "storageclass.yaml")
+				if err != nil {
+					logAndFail("failed to delete NFS storageclass: %v", err)
+				}
+
+				return false, nil
 			}
 			if isRetryableAPIError(err) {
 				return false, nil
@@ -507,11 +512,6 @@ var _ = Describe("nfs", func() {
 			if err != nil {
 				logAndFail("failed to verify mount options: %v", err)
 			}
-
-			err = deleteResource(nfsExamplePath + "storageclass.yaml")
-			if err != nil {
-				logAndFail("failed to delete NFS storageclass: %v", err)
-			}
 		})
 
 		It("verify RWOP volume support", func() {
@@ -553,10 +553,6 @@ var _ = Describe("nfs", func() {
 				logAndFail("failed to validate RWOP pod creation: %v", err)
 			}
 			validateSubvolumeCount(f, 0, fileSystemName, defaultSubvolumegroup)
-			err = deleteResource(nfsExamplePath + "storageclass.yaml")
-			if err != nil {
-				logAndFail("failed to delete NFS storageclass: %v", err)
-			}
 		})
 
 		It("create a storageclass with pool and a PVC then bind it to an app", func() {
@@ -568,10 +564,6 @@ var _ = Describe("nfs", func() {
 			if err != nil {
 				logAndFail("failed to validate NFS pvc and application binding: %v", err)
 			}
-			err = deleteResource(nfsExamplePath + "storageclass.yaml")
-			if err != nil {
-				logAndFail("failed to delete NFS storageclass: %v", err)
-			}
 		})
 
 		It("create a storageclass with relocated server and a PVC then bind it to an app", func() {
@@ -618,10 +610,6 @@ var _ = Describe("nfs", func() {
 			if err != nil {
 				logAndFail("failed to delete PVC or application: %v", err)
 			}
-			err = deleteResource(nfsExamplePath + "storageclass.yaml")
-			if err != nil {
-				logAndFail("failed to delete NFS storageclass: %v", err)
-			}
 			err = deleteNFSVolumeAttributesClass(f.ClientSet, f)
 			if err != nil {
 				logAndFail("failed to delete NFS voluemattributesclass: %v", err)
@@ -639,10 +627,6 @@ var _ = Describe("nfs", func() {
 			if err != nil {
 				logAndFail("failed to validate NFS pvc and application binding: %v", err)
 			}
-			err = deleteResource(nfsExamplePath + "storageclass.yaml")
-			if err != nil {
-				logAndFail("failed to delete NFS storageclass: %v", err)
-			}
 		})
 
 		It("create a storageclass with a restricted set of clients allowed to mount it", func() {
@@ -671,10 +655,6 @@ var _ = Describe("nfs", func() {
 			if err != nil {
 				logAndFail("failed to delete PVC: %v", err)
 			}
-			err = deleteResource(nfsExamplePath + "storageclass.yaml")
-			if err != nil {
-				logAndFail("failed to delete NFS storageclass: %v", err)
-			}
 		})
 
 		It("create a PVC and bind it to an app", func() {
@@ -1341,10 +1321,6 @@ var _ = Describe("nfs", func() {
 			if err != nil {
 				logAndFail("failed to delete PVC or application: %v", err)
 			}
-			err = deleteResource(nfsExamplePath + "storageclass.yaml")
-			if err != nil {
-				logAndFail("failed to delete NFS storageclass: %v", err)
-			}
 			err = deleteNFSVolumeAttributesClass(f.ClientSet, f)
 			if err != nil {
 				logAndFail("failed to delete NFS volumeattributesclass: %v", err)