Skip to content

Commit f3560c9

Browse files
authored
[Misc] manager: explicit logger used (#190)
Use same logger for klog as in controller-runrime. logger.
1 parent d94aff3 commit f3560c9

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

main.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"k8s.io/apimachinery/pkg/runtime"
2727
utilruntime "k8s.io/apimachinery/pkg/util/runtime"
2828
clientgoscheme "k8s.io/client-go/kubernetes/scheme"
29+
"k8s.io/klog/v2"
2930
apiregistrationv1 "k8s.io/kube-aggregator/pkg/apis/apiregistration/v1"
3031
ctrl "sigs.k8s.io/controller-runtime"
3132
"sigs.k8s.io/controller-runtime/pkg/client"
@@ -78,7 +79,11 @@ func main() {
7879
opts.BindFlags(flag.CommandLine)
7980
flag.Parse()
8081

81-
ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
82+
logger := zap.New(zap.UseFlagOptions(&opts))
83+
ctrl.SetLogger(logger)
84+
// Set klog to use the same logger as controller-runtime, so that logs from all libraries are consistent.
85+
// There seems to be an issue with leader election logs being emitted which uses klog. See: https://github.com/kubernetes-sigs/controller-runtime/issues/2656
86+
klog.SetLogger(logger)
8287

8388
if chartDir == "" {
8489
setupLog.Error(nil, "command line flag missing or empty: --chart-directory")

0 commit comments

Comments
 (0)