From 1ed5d703e6cfeb59dc6bb62e163ad93b8f77ef59 Mon Sep 17 00:00:00 2001 From: Geofrey Ernest Date: Wed, 23 Dec 2020 17:08:15 +0300 Subject: [PATCH] Short circuit error returns (#175) --- controllers/tenant_controller.go | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/controllers/tenant_controller.go b/controllers/tenant_controller.go index 2248dad2..505e3ea0 100644 --- a/controllers/tenant_controller.go +++ b/controllers/tenant_controller.go @@ -163,7 +163,7 @@ func (r *TenantReconciler) pruningResources(ns string, keys []string, obj client } r.Log.Info("Pruning objects with label selector " + s.String()) - err = retry.RetryOnConflict(retry.DefaultBackoff, func() error { + return retry.RetryOnConflict(retry.DefaultBackoff, func() error { return r.DeleteAllOf(context.TODO(), obj, &client.DeleteAllOfOptions{ ListOptions: client.ListOptions{ LabelSelector: s, @@ -172,11 +172,6 @@ func (r *TenantReconciler) pruningResources(ns string, keys []string, obj client DeleteOptions: client.DeleteOptions{}, }) }) - if err != nil { - return err - } - - return nil } // Serial ResourceQuota processing is expensive: using Go routines we can speed it up.