diff --git a/cmd/controller/controller.go b/cmd/controller/controller.go index 67fb2d72e83..050d16047cc 100644 --- a/cmd/controller/controller.go +++ b/cmd/controller/controller.go @@ -19,6 +19,7 @@ import ( "k8s.io/client-go/tools/record" "k8s.io/klog/v2" "kernel.org/pub/linux/libs/security/libcap/cap" + ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/manager/signals" @@ -49,6 +50,7 @@ func CmdMain() { } utilruntime.Must(kubeovnv1.AddToScheme(scheme.Scheme)) + ctrl.SetLogger(klog.NewKlogr()) ctx := signals.SetupSignalHandler() go func() { if config.EnablePprof { diff --git a/cmd/daemon/cniserver.go b/cmd/daemon/cniserver.go index 1fbdc37a49c..26b0068ee04 100644 --- a/cmd/daemon/cniserver.go +++ b/cmd/daemon/cniserver.go @@ -14,6 +14,7 @@ import ( v1 "k8s.io/apimachinery/pkg/apis/meta/v1" kubeinformers "k8s.io/client-go/informers" "k8s.io/klog/v2" + ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/manager/signals" @@ -71,6 +72,7 @@ func main() { util.LogFatalAndExit(err, "failed to do the OS initialization") } + ctrl.SetLogger(klog.NewKlogr()) ctx := signals.SetupSignalHandler() stopCh := ctx.Done() podInformerFactory := kubeinformers.NewSharedInformerFactoryWithOptions(config.KubeClient, 0, diff --git a/cmd/ovn_monitor/ovn_monitor.go b/cmd/ovn_monitor/ovn_monitor.go index 143d357f318..fd7f6032266 100644 --- a/cmd/ovn_monitor/ovn_monitor.go +++ b/cmd/ovn_monitor/ovn_monitor.go @@ -6,6 +6,7 @@ import ( "k8s.io/klog/v2" "kernel.org/pub/linux/libs/security/libcap/cap" + ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/manager/signals" "github.com/kubeovn/kube-ovn/pkg/metrics" @@ -43,6 +44,7 @@ func CmdMain() { } exporter.StartOvnMetrics() + ctrl.SetLogger(klog.NewKlogr()) ctx := signals.SetupSignalHandler() if err = metrics.Run(ctx, nil, addr, config.SecureServing); err != nil { util.LogFatalAndExit(err, "failed to run metrics server") diff --git a/cmd/pinger/pinger.go b/cmd/pinger/pinger.go index 9eddcfc69ab..6a9f3d37deb 100644 --- a/cmd/pinger/pinger.go +++ b/cmd/pinger/pinger.go @@ -5,6 +5,7 @@ import ( "k8s.io/klog/v2" "kernel.org/pub/linux/libs/security/libcap/cap" + ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/manager/signals" "github.com/kubeovn/kube-ovn/pkg/metrics" @@ -26,6 +27,7 @@ func main() { util.LogFatalAndExit(err, "failed to parse config") } + ctrl.SetLogger(klog.NewKlogr()) ctx := signals.SetupSignalHandler() if config.Mode == "server" { if config.EnableMetrics { diff --git a/pkg/controller/init.go b/pkg/controller/init.go index 98d78a0f9ba..70ee96dda98 100644 --- a/pkg/controller/init.go +++ b/pkg/controller/init.go @@ -16,7 +16,6 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/klog/v2" "k8s.io/utils/ptr" - ctrl "sigs.k8s.io/controller-runtime" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" @@ -898,7 +897,6 @@ func migrateFinalizers(c client.Client, list client.ObjectList, getObjectItem fu } func (c *Controller) syncFinalizers() error { - ctrl.SetLogger(klog.NewKlogr()) cl, err := client.New(config.GetConfigOrDie(), client.Options{}) if err != nil { klog.Errorf("failed to create client: %v", err)