fix multi-namespace watches

the existing implementation didn't wire up the caches correctly. this also adds a test of the namespace watch modes.
authzed · Nov 8, 2024 · e8990bf · e8990bf
1 parent 24d60c6
commit e8990bf
Show file tree

Hide file tree

Showing 4 changed files with 445 additions and 174 deletions.
diff --git a/pkg/cmd/run/run.go b/pkg/cmd/run/run.go
@@ -160,7 +160,8 @@ func (o *Options) Run(ctx context.Context, f cmdutil.Factory) error {
 
 	// register with metrics collector
 	spiceDBClusterMetrics := ctrlmetrics.NewConditionStatusCollector[*v1alpha1.SpiceDBCluster](o.MetricNamespace, "clusters", v1alpha1.SpiceDBClusterResourceName)
-	lister := typed.ListerFor[*v1alpha1.SpiceDBCluster](registry, typed.NewRegistryKey(controller.OwnedFactoryKey, v1alpha1ClusterGVR))
+	// TODO: metrics correct?
+	lister := typed.MustListerForKey[*v1alpha1.SpiceDBCluster](registry, typed.NewRegistryKey(controller.OwnedFactoryKey(""), v1alpha1ClusterGVR))
 	spiceDBClusterMetrics.AddListerBuilder(func() ([]*v1alpha1.SpiceDBCluster, error) {
 		return lister.List(labels.Everything())
 	})

diff --git a/pkg/controller/context.go b/pkg/controller/context.go
@@ -16,6 +16,7 @@ import (
 var (
 	QueueOps                  = queue.NewQueueOperationsCtx()
 	CtxOperatorConfig         = typedctx.WithDefault[*config.OperatorConfig](nil)
+	CtxCacheNamespace         = typedctx.WithDefault("")
 	CtxClusterNN              = typedctx.WithDefault(types.NamespacedName{})
 	CtxSecretNN               = typedctx.WithDefault(types.NamespacedName{})
 	CtxSecret                 = typedctx.WithDefault[*corev1.Secret](nil)