Merge pull request #7 from perdasilva/catsrc_entitysrc_cont

Catsrc entitysrc cont

Author: ankitathomas

controllers/catalogsource_controller.go

@@ -10,13 +10,14 @@ import (
 	"github.com/operator-framework/api/pkg/operators/v1alpha1"
 	"github.com/operator-framework/deppy/pkg/deppy"
 	"github.com/operator-framework/deppy/pkg/deppy/input"
-	"github.com/operator-framework/operator-controller/internal/resolution/entity_sources/catalogsource"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+
+	"github.com/operator-framework/operator-controller/internal/resolution/entity_sources/catalogsource"
 )
 
 const (
@@ -38,31 +39,42 @@ func WithRegistryClient(registry catalogsource.RegistryClient) CatalogSourceReco
 	}
 }
 
+func WithUnmanagedCatalogSourceSyncInterval(interval time.Duration) CatalogSourceReconcilerOption {
+	return func(reconciler *CatalogSourceReconciler) {
+		reconciler.unmanagedCatalogSourceSyncInterval = interval
+	}
+}
+
 // applyDefaults applies default values to empty CatalogSourceReconciler fields _after_ options have been applied
 func applyDefaults() CatalogSourceReconcilerOption {
 	return func(reconciler *CatalogSourceReconciler) {
 		if reconciler.registry == nil {
 			reconciler.registry = catalogsource.NewRegistryGRPCClient(defaultRegistryGRPCConnectionTimeout)
 		}
+		if reconciler.unmanagedCatalogSourceSyncInterval == 0 {
+			reconciler.unmanagedCatalogSourceSyncInterval = defaultCatalogSourceSyncInterval
+		}
 	}
 }
 
 type CatalogSourceReconciler struct {
 	sync.RWMutex
 	client.Client
-	scheme   *runtime.Scheme
-	registry catalogsource.RegistryClient
-	recorder record.EventRecorder
-	cache    map[string]map[deppy.Identifier]*input.Entity
+	scheme                             *runtime.Scheme
+	registry                           catalogsource.RegistryClient
+	recorder                           record.EventRecorder
+	unmanagedCatalogSourceSyncInterval time.Duration
+	cache                              map[string]map[deppy.Identifier]*input.Entity
 }
 
 func NewCatalogSourceReconciler(client client.Client, scheme *runtime.Scheme, recorder record.EventRecorder, options ...CatalogSourceReconcilerOption) *CatalogSourceReconciler {
 	reconciler := &CatalogSourceReconciler{
-		RWMutex:  sync.RWMutex{},
-		Client:   client,
-		scheme:   scheme,
-		recorder: recorder,
-		cache:    map[string]map[deppy.Identifier]*input.Entity{},
+		RWMutex:                            sync.RWMutex{},
+		Client:                             client,
+		scheme:                             scheme,
+		recorder:                           recorder,
+		unmanagedCatalogSourceSyncInterval: 0,
+		cache:                              map[string]map[deppy.Identifier]*input.Entity{},
 	}
 	// apply options
 	options = append(options, applyDefaults())
@@ -100,7 +112,7 @@ func (r *CatalogSourceReconciler) Reconcile(ctx context.Context, req ctrl.Reques
 	if isManagedCatalogSource(*catalogSource) {
 		return ctrl.Result{}, nil
 	}
-	return ctrl.Result{RequeueAfter: defaultCatalogSourceSyncInterval}, nil
+	return ctrl.Result{RequeueAfter: r.unmanagedCatalogSourceSyncInterval}, nil
 }
 
 // SetupWithManager sets up the controller with the Manager.