From e3ea141bf3831bd6486d64560b58736585122088 Mon Sep 17 00:00:00 2001
From: Andrew Keesler <akeesler@vmware.com>
Date: Mon, 14 Dec 2020 10:37:27 -0500
Subject: [PATCH] Reuse helper filter in generic secret gen controller

Signed-off-by: Andrew Keesler <akeesler@vmware.com>
---
 .../generator/oidc_provider_secrets.go        | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/internal/controller/supervisorconfig/generator/oidc_provider_secrets.go b/internal/controller/supervisorconfig/generator/oidc_provider_secrets.go
index df3fad84..36c79c26 100644
--- a/internal/controller/supervisorconfig/generator/oidc_provider_secrets.go
+++ b/internal/controller/supervisorconfig/generator/oidc_provider_secrets.go
@@ -70,23 +70,16 @@ func NewOIDCProviderSecretsController(
 		// TODO: de-dup me (jwks_writer.go).
 		withInformer(
 			secretInformer,
-			controllerlib.FilterFuncs{
-				ParentFunc: func(obj metav1.Object) controllerlib.Key {
-					if isOPCControllee(obj) {
-						controller := metav1.GetControllerOf(obj)
-						return controllerlib.Key{
-							Name:      controller.Name,
-							Namespace: obj.GetNamespace(),
-						}
+			pinnipedcontroller.SimpleFilter(isOPCControllee, func(obj metav1.Object) controllerlib.Key {
+				if isOPCControllee(obj) {
+					controller := metav1.GetControllerOf(obj)
+					return controllerlib.Key{
+						Name:      controller.Name,
+						Namespace: obj.GetNamespace(),
 					}
-					return controllerlib.Key{}
-				},
-				AddFunc: isOPCControllee,
-				UpdateFunc: func(oldObj, newObj metav1.Object) bool {
-					return isOPCControllee(oldObj) || isOPCControllee(newObj)
-				},
-				DeleteFunc: isOPCControllee,
-			},
+				}
+				return controllerlib.Key{}
+			}),
 			controllerlib.InformerOption{},
 		),
 		// We want to be notified when anything happens to an OPC.