From e2765f720a47a1aec3165db9ec52364ffd7989cc Mon Sep 17 00:00:00 2001 From: Richard Wall Date: Fri, 18 Sep 2020 10:04:28 +0100 Subject: [PATCH] Remove debug log Signed-off-by: Richard Wall --- cmd/cainjector/app/start.go | 6 ------ pkg/controller/cainjector/setup.go | 17 ++++------------- 2 files changed, 4 insertions(+), 19 deletions(-) diff --git a/cmd/cainjector/app/start.go b/cmd/cainjector/app/start.go index 6110956ad..5de3aac6e 100644 --- a/cmd/cainjector/app/start.go +++ b/cmd/cainjector/app/start.go @@ -128,9 +128,6 @@ func (o InjectorControllerOptions) RunInjectorController(ctx context.Context) er <-mgr.Elected() g.Go(func() (err error) { - defer func() { - o.log.Error(err, "certificate based controller goroutine exited") - }() for { err = cainjector.RegisterCertificateBased(gctx, mgr) if err == nil { @@ -146,9 +143,6 @@ func (o InjectorControllerOptions) RunInjectorController(ctx context.Context) er }) g.Go(func() (err error) { - defer func() { - o.log.Error(err, "secret based controller goroutine exited") - }() if err = cainjector.RegisterSecretBased(gctx, mgr); err != nil { return fmt.Errorf("error registering secret controller: %v", err) } diff --git a/pkg/controller/cainjector/setup.go b/pkg/controller/cainjector/setup.go index 57282d455..b57590bdb 100644 --- a/pkg/controller/cainjector/setup.go +++ b/pkg/controller/cainjector/setup.go @@ -78,8 +78,8 @@ var ( // registerAllInjectors registers all injectors and based on the // graduation state of the injector decides how to log no kind/resource match errors func registerAllInjectors(ctx context.Context, groupName string, mgr ctrl.Manager, sources []caDataSource, client client.Client, ca cache.Cache) error { - controllers := map[string]controller.Controller{} - for _, setup := range injectorSetups { + controllers := make([]controller.Controller, len(injectorSetups)) + for i, setup := range injectorSetups { controller, err := Register(groupName, mgr, setup, sources, ca, client) if err != nil { if !meta.IsNoMatchError(err) || !setup.injector.IsAlpha() { @@ -89,32 +89,23 @@ func registerAllInjectors(ctx context.Context, groupName string, mgr ctrl.Manage " Enable the feature on the API server in order to use this injector", "injector", setup.resourceName) } - controllers[setup.resourceName] = controller + controllers[i] = controller } g, gctx := errgroup.WithContext(ctx) g.Go(func() (err error) { - defer func() { - ctrl.Log.V(logf.TraceLevel).Error(err, "DEBUG: cache routine finished", "group-name", groupName) - }() - ctrl.Log.V(logf.TraceLevel).Info("DEBUG: cache routine starting", "group-name", groupName) if err = ca.Start(gctx.Done()); err != nil { return errors.WithStack(err) } return nil }) if ca.WaitForCacheSync(gctx.Done()) { - for resourceName, controller := range controllers { + for _, controller := range controllers { if gctx.Err() != nil { continue } - resourceName := resourceName controller := controller g.Go(func() (err error) { - defer func() { - ctrl.Log.V(logf.TraceLevel).Error(err, "DEBUG: controller routine finished", "group-name", groupName, "resourceName", resourceName) - }() - ctrl.Log.V(logf.TraceLevel).Info("DEBUG: controller routine starting", "group-name", groupName, "resourceName", resourceName) return controller.Start(gctx.Done()) }) }