Merge pull request #9107 from sbueringer/pr-fix-cr-log

k8s-ci-robot · web-flow · commit 9830681eef50 · 2023-08-07T03:50:31.000-07:00
🌱 Set controller-runtime logger for clusterctl
diff --git a/cmd/clusterctl/cmd/root.go b/cmd/clusterctl/cmd/root.go
@@ -29,6 +29,7 @@ import (
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 	kubectlcmd "k8s.io/kubectl/pkg/cmd"
+	ctrl "sigs.k8s.io/controller-runtime"
 
 	"sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"
 	logf "sigs.k8s.io/cluster-api/cmd/clusterctl/log"
@@ -163,7 +164,9 @@ func initConfig() {
 		}
 	}
 
-	logf.SetLogger(logf.NewLogger(logf.WithThreshold(verbosity)))
+	log := logf.NewLogger(logf.WithThreshold(verbosity))
+	logf.SetLogger(log)
+	ctrl.SetLogger(log)
 }
 
 func registerCompletionFuncForCommonFlags() {

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ import (`
`29`	`29`	`"github.com/pkg/errors"`
`30`	`30`	`"github.com/spf13/cobra"`
`31`	`31`	`kubectlcmd "k8s.io/kubectl/pkg/cmd"`
	`32`	`+ ctrl "sigs.k8s.io/controller-runtime"`
`32`	`33`
`33`	`34`	`"sigs.k8s.io/cluster-api/cmd/clusterctl/client/config"`
`34`	`35`	`logf "sigs.k8s.io/cluster-api/cmd/clusterctl/log"`
`@@ -163,7 +164,9 @@ func initConfig() {`
`163`	`164`	`}`
`164`	`165`	`}`
`165`	`166`
`166`		`- logf.SetLogger(logf.NewLogger(logf.WithThreshold(verbosity)))`
	`167`	`+ log := logf.NewLogger(logf.WithThreshold(verbosity))`
	`168`	`+ logf.SetLogger(log)`
	`169`	`+ ctrl.SetLogger(log)`
`167`	`170`	`}`
`168`	`171`
`169`	`172`	`func registerCompletionFuncForCommonFlags() {`