From 13ffe8cd28c7e7bcae85f9f8d45bc2e63d4d1fb3 Mon Sep 17 00:00:00 2001 From: tenzen-y Date: Wed, 24 Jan 2024 05:59:37 +0900 Subject: [PATCH] Rename setupLog with log Signed-off-by: tenzen-y --- pkg/controller/jobframework/jobframework.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/controller/jobframework/jobframework.go b/pkg/controller/jobframework/jobframework.go index f6b4502f35..bed6fd4d83 100644 --- a/pkg/controller/jobframework/jobframework.go +++ b/pkg/controller/jobframework/jobframework.go @@ -39,21 +39,21 @@ var ( func SetupControllers( mgr ctrl.Manager, - setupLog logr.Logger, + log logr.Logger, modifyOpts modifyOptions, certsReady chan struct{}, opts ...Option, ) error { // The controllers won't work until the webhooks are operating, and the webhook won't work until the // certs are all in place. - cert.WaitForCertsReady(setupLog, certsReady) + cert.WaitForCertsReady(log, certsReady) options := DefaultOptions for _, opt := range opts { opt(&options) } return ForEachIntegration(func(name string, cb IntegrationCallbacks) error { - log := setupLog.WithValues("jobFrameworkName", name) + logger := log.WithValues("jobFrameworkName", name) fwkNamePrefix := fmt.Sprintf("jobFrameworkName %q", name) if options.EnabledFrameworks.Has(name) { @@ -65,7 +65,7 @@ func SetupControllers( if !meta.IsNoMatchError(err) { return fmt.Errorf("%s: %w", fwkNamePrefix, err) } - log.Info("No matching API in the server for job framework, skipped setup of controller and webhook") + logger.Info("No matching API in the server for job framework, skipped setup of controller and webhook") } else { if err = cb.NewReconciler( mgr.GetClient(), @@ -82,7 +82,7 @@ func SetupControllers( if err = cb.SetupWebhook(mgr, opts...); err != nil { return fmt.Errorf("%s: unable to create webhook: %w", fwkNamePrefix, err) } - log.Info("Set up controller and webhook for job framework") + logger.Info("Set up controller and webhook for job framework") return nil } }