From 19bb655cac9ef09295a27457f107ccd01a9e5919 Mon Sep 17 00:00:00 2001 From: Tom Pantelis Date: Mon, 10 Jun 2024 09:22:37 -0400 Subject: [PATCH] Remove DeleteAllOf call for deployments in SD controller This call requires deletecollection RBAC permission and was put in the original code but it's really no longer necessary since we now clean everything up via a finalizer. Signed-off-by: Tom Pantelis --- .../servicediscovery/servicediscovery_controller.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/controllers/servicediscovery/servicediscovery_controller.go b/controllers/servicediscovery/servicediscovery_controller.go index 3d457b3a2..8b3dc16ec 100644 --- a/controllers/servicediscovery/servicediscovery_controller.go +++ b/controllers/servicediscovery/servicediscovery_controller.go @@ -104,14 +104,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, request reconcile.Request) ( // Request object not found, could have been deleted after reconcile request. // Owned objects are automatically garbage collected. For additional cleanup logic use finalizers. // Return and don't requeue - deployment := &appsv1.Deployment{} - opts := []controllerClient.DeleteAllOfOption{ - controllerClient.InNamespace(request.NamespacedName.Namespace), - controllerClient.MatchingLabels{"app": names.ServiceDiscoveryComponent}, - } - err := r.ScopedClient.DeleteAllOf(ctx, deployment, opts...) - - return reconcile.Result{}, errors.Wrap(err, "error deleting resource") + return reconcile.Result{}, nil } if err != nil {