test/e2e: Attempt to cleanup Operator test resources

Author: timflannagan

test/e2e/operator_test.go

@@ -51,6 +51,12 @@ var _ = Describe("Operator API", func() {
 		Expect(err).ToNot(HaveOccurred())
 	})
 
+	AfterEach(func() {
+		Eventually(func() error {
+			return operatorClient.DeleteCollection(clientCtx, metav1.DeleteOptions{}, listOpts)
+		}).Should(Succeed())
+	})
+
 	// Ensures that an Operator resource can select its components by label and surface them correctly in its status.
 	//
 	// Steps:
@@ -74,12 +80,12 @@ var _ = Describe("Operator API", func() {
 		o := &operatorsv1.Operator{}
 		o.SetName(genName("o-"))
 
-		Consistently(o).ShouldNot(ContainCopiedCSVReferences())
-
 		Eventually(func() error {
 			return client.Create(clientCtx, o)
 		}).Should(Succeed())
 
+		Consistently(o).ShouldNot(ContainCopiedCSVReferences())
+
 		defer func() {
 			Eventually(func() error {
 				err := client.Delete(clientCtx, o)
@@ -323,12 +329,21 @@ var _ = Describe("Operator API", func() {
 		})
 
 		AfterEach(func() {
+			By("Deleting the testing namespace")
 			Eventually(func() error {
-				err := client.Delete(clientCtx, ns)
-				if apierrors.IsNotFound(err) {
-					return nil
-				}
-				return err
+				return controllerclient.IgnoreNotFound(client.Delete(clientCtx, ns))
+			}).Should(Succeed())
+
+			By("Deleting the kiali-related CRDs")
+			Eventually(func() error {
+				return client.DeleteAllOf(clientCtx, &apiextensionsv1.CustomResourceDefinition{}, controllerclient.MatchingLabels{
+					fmt.Sprintf("operators.coreos.com/%s", operatorName.Name): "",
+				})
+			}).Should(Succeed())
+
+			By("Deleting the test Operator resource")
+			Eventually(func() error {
+				return operatorClient.Delete(clientCtx, operatorName.Name, metav1.DeleteOptions{})
 			}).Should(Succeed())
 		})