From 781783b61c8549a5e86e6b1d342e0e817729e03c Mon Sep 17 00:00:00 2001 From: runzexia Date: Mon, 2 Sep 2019 15:34:51 +0800 Subject: [PATCH] use klog Signed-off-by: runzexia --- cmd/controller-manager/controller-manager.go | 23 ++++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/cmd/controller-manager/controller-manager.go b/cmd/controller-manager/controller-manager.go index 76f66961d..1fce9970c 100644 --- a/cmd/controller-manager/controller-manager.go +++ b/cmd/controller-manager/controller-manager.go @@ -20,6 +20,7 @@ package main import ( "flag" + "k8s.io/klog" "kubesphere.io/kubesphere/cmd/controller-manager/app" "kubesphere.io/kubesphere/pkg/apis" "kubesphere.io/kubesphere/pkg/controller" @@ -42,44 +43,42 @@ func init() { func main() { flag.Parse() - logf.SetLogger(logf.ZapLogger(false)) - log := logf.Log.WithName("controller-manager") cfg, err := k8s.Config() if err != nil { - log.Error(err, "failed to build kubeconfig") + klog.Error(err, "failed to build kubeconfig") os.Exit(1) } stopCh := signals.SetupSignalHandler() - log.Info("setting up manager") + klog.Info("setting up manager") mgr, err := manager.New(cfg, manager.Options{}) if err != nil { - log.Error(err, "unable to set up overall controller manager") + klog.Error(err, "unable to set up overall controller manager") os.Exit(1) } - log.Info("setting up scheme") + klog.Info("setting up scheme") if err := apis.AddToScheme(mgr.GetScheme()); err != nil { - log.Error(err, "unable add APIs to scheme") + klog.Error(err, "unable add APIs to scheme") os.Exit(1) } - log.Info("Setting up controllers") + klog.Info("Setting up controllers") if err := controller.AddToManager(mgr); err != nil { - log.Error(err, "unable to register controllers to the manager") + klog.Error(err, "unable to register controllers to the manager") os.Exit(1) } if err := app.AddControllers(mgr, cfg, stopCh); err != nil { - log.Error(err, "unable to register controllers to the manager") + klog.Error(err, "unable to register controllers to the manager") os.Exit(1) } - log.Info("Starting the Cmd.") + klog.Info("Starting the Cmd.") if err := mgr.Start(stopCh); err != nil { - log.Error(err, "unable to run the manager") + klog.Error(err, "unable to run the manager") os.Exit(1) }