wait for catalogsource pod deletion

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

Author: akihikokuroda

test/e2e/util_test.go

@@ -504,11 +504,25 @@ func TearDown(namespace string) {
 	logf("test resources deleted")
 }
 
-func buildCatalogSourceCleanupFunc(crc versioned.Interface, namespace string, catalogSource *operatorsv1alpha1.CatalogSource) cleanupFunc {
+func buildCatalogSourceCleanupFunc(c operatorclient.ClientInterface, crc versioned.Interface, namespace string, catalogSource *operatorsv1alpha1.CatalogSource) cleanupFunc {
 	return func() {
 		ctx.Ctx().Logf("Deleting catalog source %s...", catalogSource.GetName())
 		err := crc.OperatorsV1alpha1().CatalogSources(namespace).Delete(context.Background(), catalogSource.GetName(), metav1.DeleteOptions{})
 		Expect(err).ToNot(HaveOccurred())
+
+		if c != nil {
+			err = wait.Poll(pollInterval, pollDuration, func() (bool, error) {
+				fetched, err := c.KubernetesInterface().CoreV1().Pods(catalogSource.GetNamespace()).List(context.TODO(), metav1.ListOptions{LabelSelector: "olm.catalogSource=" + catalogSource.GetName()})
+				if err != nil {
+					fmt.Println(err)
+					return true, err
+				}
+				if len(fetched.Items) == 0 {
+					return true, nil
+				}
+				return false, nil
+			})
+		}
 	}
 }
 
@@ -548,7 +562,7 @@ func createInvalidGRPCCatalogSource(crc versioned.Interface, name, namespace str
 	catalogSource, err := crc.OperatorsV1alpha1().CatalogSources(namespace).Create(context.Background(), catalogSource, metav1.CreateOptions{})
 	Expect(err).ToNot(HaveOccurred())
 	ctx.Ctx().Logf("Catalog source %s created", name)
-	return catalogSource, buildCatalogSourceCleanupFunc(crc, namespace, catalogSource)
+	return catalogSource, buildCatalogSourceCleanupFunc(nil, crc, namespace, catalogSource)
 }
 
 func createInternalCatalogSource(c operatorclient.ClientInterface, crc versioned.Interface, name, namespace string, manifests []registry.PackageManifest, crds []apiextensions.CustomResourceDefinition, csvs []operatorsv1alpha1.ClusterServiceVersion) (*operatorsv1alpha1.CatalogSource, cleanupFunc) {
@@ -579,7 +593,7 @@ func createInternalCatalogSource(c operatorclient.ClientInterface, crc versioned
 
 	cleanupInternalCatalogSource := func() {
 		configMapCleanup()
-		buildCatalogSourceCleanupFunc(crc, namespace, catalogSource)()
+		buildCatalogSourceCleanupFunc(c, crc, namespace, catalogSource)()
 	}
 	return catalogSource, cleanupInternalCatalogSource
 }
@@ -616,7 +630,7 @@ func createInternalCatalogSourceWithPriority(c operatorclient.ClientInterface, c
 
 	cleanupInternalCatalogSource := func() {
 		configMapCleanup()
-		buildCatalogSourceCleanupFunc(crc, namespace, catalogSource)()
+		buildCatalogSourceCleanupFunc(c, crc, namespace, catalogSource)()
 	}
 	return catalogSource, cleanupInternalCatalogSource
 }
@@ -650,7 +664,7 @@ func createV1CRDInternalCatalogSource(t GinkgoTInterface, c operatorclient.Clien
 
 	cleanupInternalCatalogSource := func() {
 		configMapCleanup()
-		buildCatalogSourceCleanupFunc(crc, namespace, catalogSource)()
+		buildCatalogSourceCleanupFunc(c, crc, namespace, catalogSource)()
 	}
 	return catalogSource, cleanupInternalCatalogSource
 }