From 27ab24fe062beb66154439b26127b8d5ae90f48b 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 +++++----- .../jobs/pytorchjob/pytorchjob_controller_test.go | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/pkg/controller/jobframework/jobframework.go b/pkg/controller/jobframework/jobframework.go index f6b4502f35a..bed6fd4d835 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 } } diff --git a/test/integration/controller/jobs/pytorchjob/pytorchjob_controller_test.go b/test/integration/controller/jobs/pytorchjob/pytorchjob_controller_test.go index 40be3a57b55..d27a57a5eb8 100644 --- a/test/integration/controller/jobs/pytorchjob/pytorchjob_controller_test.go +++ b/test/integration/controller/jobs/pytorchjob/pytorchjob_controller_test.go @@ -25,10 +25,9 @@ import ( metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/types" "k8s.io/utils/ptr" - "sigs.k8s.io/controller-runtime/pkg/client" - configapi "sigs.k8s.io/kueue/apis/config/v1beta1" + configapi "sigs.k8s.io/kueue/apis/config/v1beta1" kueue "sigs.k8s.io/kueue/apis/kueue/v1beta1" "sigs.k8s.io/kueue/pkg/controller/constants" "sigs.k8s.io/kueue/pkg/controller/jobframework"