Ensure always deletion occurs in AfterEach

Signed-off-by: Kyle Squizzato <[email protected]>

test/e2e/kubeclient/kubeclient.go

@@ -16,6 +16,7 @@ package kubeclient
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"os"
 	"path/filepath"
@@ -75,7 +76,13 @@ func (kc *KubeClient) WriteKubeconfig(ctx context.Context, clusterName string) (
 		To(Succeed())
 
 	deleteFunc := func() error {
-		return os.Remove(filepath.Join(dir, path))
+		if err = os.Remove(filepath.Join(dir, path)); err != nil {
+			if errors.Is(err, os.ErrNotExist) {
+				return nil
+			}
+			return err
+		}
+		return nil
 	}
 
 	return path, deleteFunc

test/e2e/provider_aws_test.go

@@ -56,17 +56,17 @@ var _ = Describe("AWS Templates", Label("provider:cloud", "provider:aws"), Order
 				By("collecting failure logs from hosted controllers")
 				collectLogArtifacts(standaloneClient, clusterName, managedcluster.ProviderAWS, managedcluster.ProviderCAPI)
 			}
+		}
 
-			By("deleting resources after failure")
-			for _, deleteFunc := range []func() error{
-				kubecfgDeleteFunc,
-				hostedDeleteFunc,
-				standaloneDeleteFunc,
-			} {
-				if deleteFunc != nil {
-					err := deleteFunc()
-					Expect(err).NotTo(HaveOccurred())
-				}
+		By("deleting resources")
+		for _, deleteFunc := range []func() error{
+			kubecfgDeleteFunc,
+			hostedDeleteFunc,
+			standaloneDeleteFunc,
+		} {
+			if deleteFunc != nil {
+				err := deleteFunc()
+				Expect(err).NotTo(HaveOccurred())
 			}
 		}
 	})
@@ -165,7 +165,6 @@ var _ = Describe("AWS Templates", Label("provider:cloud", "provider:aws"), Order
 		Eventually(func() error {
 			return deletionValidator.Validate(context.Background(), standaloneClient)
 		}).WithTimeout(10 * time.Minute).WithPolling(10 * time.Second).Should(Succeed())
-
 		// Now delete the standalone ManagedCluster and verify it is
 		// removed, it is deleted last since it is the basis for the hosted
 		// cluster.

test/e2e/provider_azure_test.go

@@ -60,17 +60,18 @@ var _ = Context("Azure Templates", Label("provider:cloud", "provider:azure"), Or
 			if standaloneClient != nil {
 				collectLogArtifacts(standaloneClient, sdName, managedcluster.ProviderAzure, managedcluster.ProviderCAPI)
 			}
+		}
 
-			By("deleting resources after failure")
-			for _, deleteFunc := range []func() error{
-				kubecfgDeleteFunc,
-				hostedDeleteFunc,
-				standaloneDeleteFunc,
-			} {
-				if deleteFunc != nil {
-					err := deleteFunc()
-					Expect(err).NotTo(HaveOccurred())
-				}
+		By("deleting resources")
+		for _, deleteFunc := range []func() error{
+			hostedKubecfgDeleteFunc,
+			kubecfgDeleteFunc,
+			hostedDeleteFunc,
+			standaloneDeleteFunc,
+		} {
+			if deleteFunc != nil {
+				err := deleteFunc()
+				Expect(err).NotTo(HaveOccurred())
 			}
 		}
 	})