Move CatalogSource tests to use e2e client

Signed-off-by: perdasilva <[email protected]>

Author: perdasilva

Diff for: test/e2e/catalog_e2e_test.go

@@ -41,9 +41,13 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
 		crc versioned.Interface
 		ns  corev1.Namespace
 	)
+
 	BeforeEach(func() {
 		c = newKubeClient()
 		crc = newCRClient()
+		// Create a new e2e kube client session tracking and tagging created resources
+		ctx.Ctx().NewClientSession()
+
 		namespaceName := genName("catsrc-e2e-")
 		og := operatorsv1.OperatorGroup{
 			ObjectMeta: metav1.ObjectMeta{
@@ -56,6 +60,9 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
 
 	AfterEach(func() {
 		TeardownNamespace(ns.GetName())
+
+		// Tear down e2e client and thereby any test resources created with it
+		Expect(ctx.Ctx().EndClientSession()).To(Succeed())
 	})
 
 	It("loading between restarts", func() {
@@ -496,7 +503,7 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
 			},
 		}
 
-		addressSource, err = crc.OperatorsV1alpha1().CatalogSources(ns.GetName()).Create(context.Background(), addressSource, metav1.CreateOptions{})
+		err = ctx.Ctx().E2EClient().Create(context.TODO(), addressSource)
 		Expect(err).ShouldNot(HaveOccurred())
 		defer func() {
 			err := crc.OperatorsV1alpha1().CatalogSources(ns.GetName()).Delete(context.Background(), addressSourceName, metav1.DeleteOptions{})
@@ -622,7 +629,7 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
 			},
 		}
 
-		source, err := crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.Background(), source, metav1.CreateOptions{})
+		err := ctx.Ctx().E2EClient().Create(context.TODO(), source)
 		Expect(err).ShouldNot(HaveOccurred())
 
 		// Wait for a new registry pod to be created
@@ -757,7 +764,7 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
 			},
 		}
 
-		source, err = crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.Background(), source, metav1.CreateOptions{})
+		err = ctx.Ctx().E2EClient().Create(context.TODO(), source)
 		Expect(err).ShouldNot(HaveOccurred())
 		defer func() {
 			err := crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Delete(context.Background(), source.GetName(), metav1.DeleteOptions{})
@@ -914,7 +921,7 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
 			},
 		}
 
-		source, err := crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.Background(), source, metav1.CreateOptions{})
+		err := ctx.Ctx().E2EClient().Create(context.TODO(), source)
 		Expect(err).ShouldNot(HaveOccurred())
 		defer func() {
 			err := crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Delete(context.Background(), source.GetName(), metav1.DeleteOptions{})
@@ -1004,9 +1011,7 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
 		//   a) the new update pod is spun up roughly in line with the registry polling interval
 		//   b) the update pod is removed quickly when the image is found to not have changed
 		// This is more of a behavioral test that ensures the feature is working as designed.
-
 		c := newKubeClient()
-		crc := newCRClient()
 
 		sourceName := genName("catalog-")
 		source := &v1alpha1.CatalogSource{
@@ -1030,7 +1035,7 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
 			},
 		}
 
-		source, err := crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.Background(), source, metav1.CreateOptions{})
+		err := ctx.Ctx().E2EClient().Create(context.TODO(), source)
 		Expect(err).ToNot(HaveOccurred())
 
 		// wait for new catalog source pod to be created and report ready
@@ -1095,7 +1100,7 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
 
 		var err error
 		Eventually(func() error {
-			source, err = crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Create(context.Background(), source, metav1.CreateOptions{})
+			err := ctx.Ctx().E2EClient().Create(context.TODO(), source)
 			return err
 		}).Should(Succeed())
 
@@ -1221,7 +1226,7 @@ func replicateCatalogPod(c operatorclient.ClientInterface, catalog *v1alpha1.Cat
 		Spec: pod.Spec,
 	}
 
-	copied, err = c.KubernetesInterface().CoreV1().Pods(catalog.GetNamespace()).Create(context.Background(), copied, metav1.CreateOptions{})
+	err = ctx.Ctx().E2EClient().Create(context.TODO(), copied)
 	Expect(err).ToNot(HaveOccurred())
 
 	return copied