Merge pull request #6 from authzed/registry-remove

Add a `Remove` method to the informerfactory Registry.

Author: ecordell

manager/manager.go

@@ -62,15 +62,19 @@ func NewManager(debugConfig *componentconfig.DebuggingConfiguration, address str
 // health / debug endpoints for them. It stops when the context is cancelled.
 // It will only have an effect the first time it is called.
 func (m *Manager) Start(ctx context.Context, controllers ...Controller) error {
+	m.RLock()
 	if m.errG != nil {
 		return fmt.Errorf("manager already started")
 	}
+	m.RUnlock()
 
 	broadcaster := record.NewBroadcaster()
 
 	m.once.Do(func() {
+		m.Lock()
 		m.errG, ctx = errgroup.WithContext(ctx)
 		m.errGCtx = ctx
+		m.Unlock()
 
 		// start controllers
 		if err := m.Go(controllers...); err != nil {
@@ -105,17 +109,19 @@ func (m *Manager) Start(ctx context.Context, controllers ...Controller) error {
 
 // Go adds controllers into the existing manager's errgroup
 func (m *Manager) Go(controllers ...Controller) error {
-	if m.errG == nil {
+	m.RLock()
+	errG := m.errG
+	if errG == nil {
 		return fmt.Errorf("cannot add controllers to an unstarted manager")
 	}
-
 	ctx := m.errGCtx
+	m.RUnlock()
 
 	// start newly added controllers
 	for _, c := range controllers {
 		c := c
 		m.healthzHandler.AddHealthChecker(controllerhealthz.NamedHealthChecker(c.Name(), c.HealthChecker()))
-		m.errG.Go(func() error {
+		errG.Go(func() error {
 			ctx, cancel := context.WithCancel(ctx)
 			m.Lock()
 			m.cancelFuncs[c] = cancel

typed/registry.go

@@ -72,6 +72,9 @@ func NewRegistry() *Registry {
 	}
 }
 
+// MustNewFilteredDynamicSharedInformerFactory creates a new SharedInformerFactory
+// and registers it under the given RegistryKey. It panics if there is already
+// an entry with that key.
 func (r *Registry) MustNewFilteredDynamicSharedInformerFactory(key FactoryKey, client dynamic.Interface, defaultResync time.Duration, namespace string, tweakListOptions dynamicinformer.TweakListOptionsFunc) dynamicinformer.DynamicSharedInformerFactory {
 	factory, err := r.NewFilteredDynamicSharedInformerFactory(key, client, defaultResync, namespace, tweakListOptions)
 	if err != nil {
@@ -80,6 +83,8 @@ func (r *Registry) MustNewFilteredDynamicSharedInformerFactory(key FactoryKey, c
 	return factory
 }
 
+// NewFilteredDynamicSharedInformerFactory creates a new SharedInformerFactory
+// and registers it under the given RegistryKey
 func (r *Registry) NewFilteredDynamicSharedInformerFactory(key FactoryKey, client dynamic.Interface, defaultResync time.Duration, namespace string, tweakListOptions dynamicinformer.TweakListOptionsFunc) (dynamicinformer.DynamicSharedInformerFactory, error) {
 	r.Lock()
 	defer r.Unlock()
@@ -100,12 +105,23 @@ func IndexerFor[K runtime.Object](r *Registry, key RegistryKey) *Indexer[K] {
 	return NewIndexer[K](r.InformerFor(key).GetIndexer())
 }
 
+// Add adds a factory to the registry under the given RegistryKey
 func (r *Registry) Add(key RegistryKey, factory dynamicinformer.DynamicSharedInformerFactory) {
 	r.Lock()
 	defer r.Unlock()
 	r.factories[key] = factory
 }
 
+// Remove removes a factory from the registry. Note that it does not stop any
+// informers that were started via the factory; they should be stopped via
+// context cancellation.
+func (r *Registry) Remove(key RegistryKey, factory dynamicinformer.DynamicSharedInformerFactory) {
+	r.Lock()
+	defer r.Unlock()
+	delete(r.factories, key)
+}
+
+// InformerFactoryFor returns GVR-specific InformerFactory from the Registry.
 func (r *Registry) InformerFactoryFor(key RegistryKey) informers.GenericInformer {
 	r.RLock()
 	defer r.RUnlock()
@@ -116,14 +132,17 @@ func (r *Registry) InformerFactoryFor(key RegistryKey) informers.GenericInformer
 	return factory.ForResource(key.GroupVersionResource)
 }
 
+// ListerFor returns the GVR-specific Lister from the Registry
 func (r *Registry) ListerFor(key RegistryKey) cache.GenericLister {
 	return r.InformerFactoryFor(key).Lister()
 }
 
+// InformerFor returns the GVR-specific Informer from the Registry
 func (r *Registry) InformerFor(key RegistryKey) cache.SharedIndexInformer {
 	return r.InformerFactoryFor(key).Informer()
 }
 
+// IndexerFor returns the GVR-specific Indexer from the Registry
 func (r *Registry) IndexerFor(key RegistryKey) cache.Indexer {
 	return r.InformerFactoryFor(key).Informer().GetIndexer()
 }