Merge pull request #139 from enj/enj/i/use_parent_func

Use parent func to indicate when the controller queue is a singleton

internal/controller/authenticator/webhookcachecleaner/webhookcachecleaner.go

@@ -31,7 +31,7 @@ func New(cache *authncache.Cache, webhooks authinformers.WebhookAuthenticatorInf
 		},
 		controllerlib.WithInformer(
 			webhooks,
-			pinnipedcontroller.MatchAnythingFilter(),
+			pinnipedcontroller.MatchAnythingFilter(pinnipedcontroller.SingletonQueue()),
 			controllerlib.InformerOption{},
 		),
 	)

internal/controller/authenticator/webhookcachefiller/webhookcachefiller.go

@@ -40,7 +40,7 @@ func New(cache *authncache.Cache, webhooks authinformers.WebhookAuthenticatorInf
 		},
 		controllerlib.WithInformer(
 			webhooks,
-			pinnipedcontroller.MatchAnythingFilter(),
+			pinnipedcontroller.MatchAnythingFilter(nil), // nil parent func is fine because each event is distinct
 			controllerlib.InformerOption{},
 		),
 	)

internal/controller/kubecertagent/annotater.go

@@ -71,12 +71,12 @@ func NewAnnotaterController(
 		},
 		withInformer(
 			kubeSystemPodInformer,
-			pinnipedcontroller.SimpleFilter(isControllerManagerPod),
+			pinnipedcontroller.SimpleFilterWithSingletonQueue(isControllerManagerPod),
 			controllerlib.InformerOption{},
 		),
 		withInformer(
 			agentPodInformer,
-			pinnipedcontroller.SimpleFilter(isAgentPod),
+			pinnipedcontroller.SimpleFilterWithSingletonQueue(isAgentPod),
 			controllerlib.InformerOption{},
 		),
 	)

internal/controller/kubecertagent/creater.go

@@ -65,12 +65,12 @@ func NewCreaterController(
 		},
 		withInformer(
 			kubeSystemPodInformer,
-			pinnipedcontroller.SimpleFilter(isControllerManagerPod),
+			pinnipedcontroller.SimpleFilterWithSingletonQueue(isControllerManagerPod),
 			controllerlib.InformerOption{},
 		),
 		withInformer(
 			agentPodInformer,
-			pinnipedcontroller.SimpleFilter(isAgentPod),
+			pinnipedcontroller.SimpleFilterWithSingletonQueue(isAgentPod),
 			controllerlib.InformerOption{},
 		),
 		// Be sure to run once even to make sure the CI is updated if there are no controller manager

internal/controller/kubecertagent/deleter.go

@@ -43,12 +43,12 @@ func NewDeleterController(
 		},
 		withInformer(
 			kubeSystemPodInformer,
-			pinnipedcontroller.SimpleFilter(isControllerManagerPod),
+			pinnipedcontroller.SimpleFilterWithSingletonQueue(isControllerManagerPod),
 			controllerlib.InformerOption{},
 		),
 		withInformer(
 			agentPodInformer,
-			pinnipedcontroller.SimpleFilter(isAgentPod),
+			pinnipedcontroller.SimpleFilterWithSingletonQueue(isAgentPod),
 			controllerlib.InformerOption{},
 		),
 	)

internal/controller/kubecertagent/execer.go

@@ -56,7 +56,7 @@ func NewExecerController(
 		},
 		withInformer(
 			agentPodInformer,
-			pinnipedcontroller.SimpleFilter(isAgentPod),
+			pinnipedcontroller.SimpleFilter(isAgentPod, nil), // nil parent func is fine because each event is distinct
 			controllerlib.InformerOption{},
 		),
 	)

internal/controller/supervisorconfig/jwks_observer.go

@@ -49,12 +49,12 @@ func NewJWKSObserverController(
 		},
 		withInformer(
 			secretInformer,
-			pinnipedcontroller.MatchAnythingFilter(),
+			pinnipedcontroller.MatchAnythingFilter(nil),
 			controllerlib.InformerOption{},
 		),
 		withInformer(
 			oidcProviderInformer,
-			pinnipedcontroller.MatchAnythingFilter(),
+			pinnipedcontroller.MatchAnythingFilter(nil),
 			controllerlib.InformerOption{},
 		),
 	)

internal/controller/supervisorconfig/jwks_writer.go

@@ -110,7 +110,7 @@ func NewJWKSWriterController(
 		// We want to be notified when anything happens to an OPC.
 		withInformer(
 			opcInformer,
-			pinnipedcontroller.MatchAnythingFilter(),
+			pinnipedcontroller.MatchAnythingFilter(nil), // nil parent func is fine because each event is distinct
 			controllerlib.InformerOption{},
 		),
 	)

internal/controller/supervisorconfig/oidcproviderconfig_watcher.go

@@ -60,7 +60,7 @@ func NewOIDCProviderWatcherController(
 		},
 		withInformer(
 			opcInformer,
-			pinnipedcontroller.MatchAnythingFilter(),
+			pinnipedcontroller.MatchAnythingFilter(pinnipedcontroller.SingletonQueue()),
 			controllerlib.InformerOption{},
 		),
 	)

internal/controller/supervisorconfig/tls_cert_observer.go

@@ -49,12 +49,12 @@ func NewTLSCertObserverController(
 		},
 		withInformer(
 			secretInformer,
-			pinnipedcontroller.MatchAnythingFilter(),
+			pinnipedcontroller.MatchAnythingFilter(nil),
 			controllerlib.InformerOption{},
 		),
 		withInformer(
 			oidcProviderInformer,
-			pinnipedcontroller.MatchAnythingFilter(),
+			pinnipedcontroller.MatchAnythingFilter(nil),
 			controllerlib.InformerOption{},
 		),
 	)

internal/controller/utils.go

@@ -12,23 +12,38 @@ import (
 func NameAndNamespaceExactMatchFilterFactory(name, namespace string) controllerlib.Filter {
 	return SimpleFilter(func(obj metav1.Object) bool {
 		return obj.GetName() == name && obj.GetNamespace() == namespace
-	})
+		// nil parent func is fine because we only match a key with the given name and namespace
+		// i.e. it is equivalent to having a SingletonQueue() parent func
+	}, nil)
 }
 
 // MatchAnythingFilter returns a controllerlib.Filter that allows all objects.
-func MatchAnythingFilter() controllerlib.Filter {
-	return SimpleFilter(func(object metav1.Object) bool { return true })
+func MatchAnythingFilter(parentFunc controllerlib.ParentFunc) controllerlib.Filter {
+	return SimpleFilter(func(object metav1.Object) bool { return true }, parentFunc)
 }
 
 // SimpleFilter takes a single boolean match function on a metav1.Object and wraps it into a proper controllerlib.Filter.
-func SimpleFilter(match func(metav1.Object) bool) controllerlib.Filter {
+func SimpleFilter(match func(metav1.Object) bool, parentFunc controllerlib.ParentFunc) controllerlib.Filter {
 	return controllerlib.FilterFuncs{
 		AddFunc:    match,
 		UpdateFunc: func(oldObj, newObj metav1.Object) bool { return match(oldObj) || match(newObj) },
 		DeleteFunc: match,
+		ParentFunc: parentFunc,
 	}
 }
 
+// SingletonQueue returns a parent func that treats all events as the same key.
+func SingletonQueue() controllerlib.ParentFunc {
+	return func(_ metav1.Object) controllerlib.Key {
+		return controllerlib.Key{}
+	}
+}
+
+// SimpleFilterWithSingletonQueue returns a Filter based on the given match function that treats all events as the same key.
+func SimpleFilterWithSingletonQueue(match func(metav1.Object) bool) controllerlib.Filter {
+	return SimpleFilter(match, SingletonQueue())
+}
+
 // Same signature as controllerlib.WithInformer().
 type WithInformerOptionFunc func(
 	getter controllerlib.InformerGetter,