fix(catalog): fill the csv cache with informers

Author: ecordell

pkg/controller/operators/catalog/operator.go

@@ -89,10 +89,12 @@ func NewOperator(kubeconfigPath string, logger *logrus.Logger, wakeupInterval ti
 	// Create an informer for each watched namespace.
 	ipSharedIndexInformers := []cache.SharedIndexInformer{}
 	subSharedIndexInformers := []cache.SharedIndexInformer{}
+	csvSharedIndexInformers := []cache.SharedIndexInformer{}
 	for _, namespace := range watchedNamespaces {
 		nsInformerFactory := externalversions.NewSharedInformerFactoryWithOptions(crClient, wakeupInterval, externalversions.WithNamespace(namespace))
 		ipSharedIndexInformers = append(ipSharedIndexInformers, nsInformerFactory.Operators().V1alpha1().InstallPlans().Informer())
 		subSharedIndexInformers = append(subSharedIndexInformers, nsInformerFactory.Operators().V1alpha1().Subscriptions().Informer())
+		csvSharedIndexInformers = append(csvSharedIndexInformers, nsInformerFactory.Operators().V1alpha1().ClusterServiceVersions().Informer())
 
 		// resolver needs subscription and csv listers
 		lister.OperatorsV1alpha1().RegisterSubscriptionLister(namespace, nsInformerFactory.Operators().V1alpha1().Subscriptions().Lister())
@@ -230,6 +232,11 @@ func NewOperator(kubeconfigPath string, logger *logrus.Logger, wakeupInterval ti
 	op.lister.CoreV1().RegisterNamespaceLister(namespaceInformer.Lister())
 	op.namespaceResolveQueue = resolvingNamespaceQueue
 
+	// Register CSV informers to fill cache
+	for _, informer := range csvSharedIndexInformers {
+		op.RegisterInformer(informer)
+	}
+
 	return op, nil
 }
 

pkg/controller/registry/resolver/resolver.go

@@ -41,10 +41,20 @@ func (r *OperatorsV1alpha1Resolver) ResolveSteps(namespace string, sourceQuerier
 	}
 
 	// create a generation - a representation of the current set of installed operators and their provided/required apis
-	csvs, err := r.csvLister.ClusterServiceVersions(namespace).List(labels.Everything())
+	allCSVs, err := r.csvLister.ClusterServiceVersions(namespace).List(labels.Everything())
 	if err != nil {
 		return nil, nil, err
 	}
+
+	// TODO: build this index ahead of time
+	// omit copied csvs from generation - they indicate that apis are provided to the namespace, not by the namespace
+	var csvs []*v1alpha1.ClusterServiceVersion
+	for _, c := range allCSVs {
+		if !c.IsCopied() {
+			csvs = append(csvs, c)
+		}
+	}
+
 	subs, err := r.subLister.Subscriptions(namespace).List(labels.Everything())
 	if err != nil {
 		return nil, nil, err