fix lint errors

Signed-off-by: Avinash Patnala <avinashpatnala@google.com>
open-policy-agent · Sep 20, 2024 · a871c3b · a871c3b
1 parent 60ec8d5
commit a871c3b
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 16 deletions.
diff --git a/pkg/controller/config/config_controller.go b/pkg/controller/config/config_controller.go
@@ -120,7 +120,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 	}
 
 	err = c.Watch(
-		source.Kind(mgr.GetCache(), &statusv1beta1.ConfigPodStatus{}, handler.TypedEnqueueRequestsFromMapFunc(configstatus.PodStatusToConfigMapper(true, util.EventPackerMapFunc()))))
+		source.Kind(mgr.GetCache(), &statusv1beta1.ConfigPodStatus{}, handler.TypedEnqueueRequestsFromMapFunc(configstatus.PodStatusToConfigMapper(true))))
 	if err != nil {
 		return err
 	}

diff --git a/pkg/controller/configstatus/configstatus_controller.go b/pkg/controller/configstatus/configstatus_controller.go
@@ -73,11 +73,9 @@ func newReconciler(mgr manager.Manager) reconcile.Reconciler {
 	}
 }
 
-type PackerMap func(obj client.Object) []reconcile.Request
-
 // PodStatusToConfigMapper correlates a ConfigPodStatus with its corresponding Config.
 // `selfOnly` tells the mapper to only map statuses corresponding to the current pod.
-func PodStatusToConfigMapper(selfOnly bool, packerMap handler.MapFunc) handler.TypedMapFunc[*v1beta1.ConfigPodStatus] {
+func PodStatusToConfigMapper(selfOnly bool) handler.TypedMapFunc[*v1beta1.ConfigPodStatus] {
 	return func(_ context.Context, obj *v1beta1.ConfigPodStatus) []reconcile.Request {
 		labels := obj.GetLabels()
 		name, ok := labels[v1beta1.ConfigNameLabel]
@@ -109,7 +107,7 @@ func add(mgr manager.Manager, r reconcile.Reconciler) error {
 	}
 
 	err = c.Watch(
-		source.Kind(mgr.GetCache(), &v1beta1.ConfigPodStatus{}, handler.TypedEnqueueRequestsFromMapFunc(PodStatusToConfigMapper(false, util.EventPackerMapFunc()))))
+		source.Kind(mgr.GetCache(), &v1beta1.ConfigPodStatus{}, handler.TypedEnqueueRequestsFromMapFunc(PodStatusToConfigMapper(false))))
 	if err != nil {
 		return err
 	}

diff --git a/pkg/readiness/ready_tracker.go b/pkg/readiness/ready_tracker.go
@@ -89,17 +89,6 @@ type Tracker struct {
 	trackListerPredicateOverride retryPredicate
 }
 
-type WrapFakeClientWithMutex struct {
-	listMutex  sync.Mutex
-	fakeLister Lister
-}
-
-func (w *WrapFakeClientWithMutex) List(ctx context.Context, list client.ObjectList, opts ...client.ListOption) error {
-	w.listMutex.Lock()
-	defer w.listMutex.Unlock()
-	return w.fakeLister.List(ctx, list, opts...)
-}
-
 // NewTracker creates a new Tracker and initializes the internal trackers.
 func NewTracker(lister Lister, mutationEnabled, externalDataEnabled, expansionEnabled bool) *Tracker {
 	// TODO: Dereference crashOnFailureFetchingExpectations when we change crashOnFailureFetchingExpectations to a flag