fix(e2e): fix installplan test cleanup

cleanup function was hanging, so explicitly clean up here

Author: ecordell

pkg/controller/operators/catalog/operator.go

@@ -323,22 +323,6 @@ func (o *Operator) handleDeletion(obj interface{}) {
 		return
 	}
 
-	// Check the registry server
-	checker := o.reconciler.ReconcilerForSource(catsrc)
-	healthy, err := checker.CheckRegistryServer(catsrc)
-	if err != nil {
-		logger.WithError(err).Warn("error checking registry health")
-	} else if !healthy {
-		logger.Debug("registry server unhealthy, updating catalog source")
-		catsrc.Status.RegistryServiceStatus = nil
-		_, err = o.client.OperatorsV1alpha1().CatalogSources(catsrc.GetNamespace()).UpdateStatus(catsrc)
-		if err == nil {
-			logger.Debug("successfully updated catalogsource registry status")
-			return
-		}
-		logger.WithError(err).Warn("error updating catalogsource registry status")
-	}
-
 	// Requeue CatalogSource
 	if err := o.catSrcQueueSet.Requeue(catsrc.GetName(), catsrc.GetNamespace()); err != nil {
 		logger.WithError(err).Warn("error requeuing owner catalogsource")
@@ -429,13 +413,13 @@ func (o *Operator) syncCatalogSources(obj interface{}) (syncError error) {
 		logger.Debug("catsrc configmap state good, checking registry pod")
 	}
 
-	reconciler := o.reconciler.ReconcilerForSource(catsrc)
-	if reconciler == nil {
+	srcReconciler := o.reconciler.ReconcilerForSource(catsrc)
+	if srcReconciler == nil {
 		// TODO: Add failure status on catalogsource and remove from sources
 		return fmt.Errorf("no reconciler for source type %s", catsrc.Spec.SourceType)
 	}
 
-	healthy, err := reconciler.CheckRegistryServer(catsrc)
+	healthy, err := srcReconciler.CheckRegistryServer(catsrc)
 	if err != nil {
 		return err
 	}
@@ -444,7 +428,7 @@ func (o *Operator) syncCatalogSources(obj interface{}) (syncError error) {
 	if !healthy || catsrc.Status.RegistryServiceStatus == nil || catsrc.Status.RegistryServiceStatus.CreatedAt.Before(&catsrc.Status.LastSync) {
 		logger.Debug("ensuring registry server")
 
-		if err := reconciler.EnsureRegistryServer(out); err != nil {
+		if err := srcReconciler.EnsureRegistryServer(out); err != nil {
 			logger.WithError(err).Warn("couldn't ensure registry server")
 			return err
 		}
@@ -919,7 +903,7 @@ func (o *Operator) createInstallPlan(namespace string, subs []*v1alpha1.Subscrip
 func (o *Operator) requeueSubscription(name, namespace string) {
 	// we can build the key directly, will need to change if queue uses different key scheme
 	key := fmt.Sprintf("%s/%s", namespace, name)
-	o.subQueue.AddRateLimited(key)
+	o.subQueue.Add(key)
 	return
 }
 

test/e2e/installplan_e2e_test.go

@@ -333,14 +333,16 @@ EXPECTED:
 	log("All expected resources resolved")
 
 	// Verify that the dependent subscription is in a good state
-	dependentSubscription, err := fetchSubscription(t, crc, testNamespace, strings.Join([]string{dependentPackageStable, dependentCatalogName, testNamespace}, "-"), subscriptionHasInstallPlanChecker)
+	dependentSubscription, err := fetchSubscription(t, crc, testNamespace, strings.Join([]string{dependentPackageStable, dependentCatalogName, testNamespace}, "-"), subscriptionStateAtLatestChecker)
 	require.NoError(t, err)
 	require.NotNil(t, dependentSubscription)
 	require.NotNil(t, dependentSubscription.Status.InstallPlanRef)
-	require.Equal(t, "AtLatestKnown", string(dependentSubscription.Status.State))
 	require.Equal(t, dependentCSV.GetName(), dependentSubscription.Status.CurrentCSV)
 
-	// TODO: update dependent subscription in catalog and wait for csv to update
+	fetchedCSV, err := awaitCSV(t, crc, testNamespace, dependentCSV.GetName(), csvAnyChecker)
+	require.NoError(t, err)
+
+	// Update dependent subscription in catalog and wait for csv to update
 	updatedDependentCSV := newCSV(dependentPackageStable+"v2", testNamespace, dependentPackageStable, semver.MustParse("0.1.1"), []apiextensions.CustomResourceDefinition{dependentCRD}, nil, dependentNamedStrategy)
 	dependentManifests = []registry.PackageManifest{
 		{
@@ -355,6 +357,12 @@ EXPECTED:
 
 	dependentSubscription, err = fetchSubscription(t, crc, testNamespace, strings.Join([]string{dependentPackageStable, dependentCatalogName, testNamespace}, "-"), subscriptionHasCurrentCSV(updatedDependentCSV.GetName()))
 	require.NoError(t, err)
+
+	fetchedCSV, err = awaitCSV(t, crc, testNamespace, updatedDependentCSV.GetName(), csvAnyChecker)
+	require.NoError(t, err)
+
+	err = crc.OperatorsV1alpha1().ClusterServiceVersions(testNamespace).Delete(fetchedCSV.GetName(), metav1.NewDeleteOptions(0))
+	require.NoError(t, err)
 }
 
 func TestCreateInstallPlanWithPreExistingCRDOwners(t *testing.T) {

test/e2e/util_test.go

@@ -369,24 +369,28 @@ func cleanupOLM(t *testing.T, namespace string) {
 	var err error
 	err = waitForEmptyList(func() (int, error) {
 		res, err := crc.OperatorsV1alpha1().ClusterServiceVersions(namespace).List(metav1.ListOptions{FieldSelector: nonPersistentCSVFieldSelector})
+		t.Logf("%d %s remaining", len(res.Items), "csvs")
 		return len(res.Items), err
 	})
 	require.NoError(t, err)
 
 	err = waitForEmptyList(func() (int, error) {
 		res, err := crc.OperatorsV1alpha1().InstallPlans(namespace).List(metav1.ListOptions{})
+		t.Logf("%d %s remaining", len(res.Items), "installplans")
 		return len(res.Items), err
 	})
 	require.NoError(t, err)
 
 	err = waitForEmptyList(func() (int, error) {
 		res, err := crc.OperatorsV1alpha1().Subscriptions(namespace).List(metav1.ListOptions{})
+		t.Logf("%d %s remaining", len(res.Items), "subs")
 		return len(res.Items), err
 	})
 	require.NoError(t, err)
 
 	err = waitForEmptyList(func() (int, error) {
 		res, err := crc.OperatorsV1alpha1().CatalogSources(namespace).List(metav1.ListOptions{FieldSelector: nonPersistentCatalogsFieldSelector})
+		t.Logf("%d %s remaining", len(res.Items), "catalogs")
 		return len(res.Items), err
 	})
 	require.NoError(t, err)