From c3e3ecc8c4175bc571524c2785d6e1f8478cf841 Mon Sep 17 00:00:00 2001 From: Nick Santos Date: Mon, 4 Dec 2023 12:49:42 -0500 Subject: [PATCH] cli: send controller-runtime logs to /dev/null (#6275) this has been noticed in a few places, including https://github.com/tilt-dev/tilt/issues/6265 all users of controller-runtime now need to set a default logger Signed-off-by: Nick Santos --- internal/cli/cli.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/internal/cli/cli.go b/internal/cli/cli.go index 882a031b4e..aaa87ca585 100644 --- a/internal/cli/cli.go +++ b/internal/cli/cli.go @@ -8,9 +8,11 @@ import ( "syscall" "time" + "github.com/go-logr/logr" "github.com/spf13/cobra" "go.lsp.dev/protocol" "k8s.io/cli-runtime/pkg/genericclioptions" + ctrllog "sigs.k8s.io/controller-runtime/pkg/log" "github.com/tilt-dev/starlark-lsp/pkg/cli" tiltanalytics "github.com/tilt-dev/tilt/internal/analytics" @@ -111,6 +113,7 @@ func createContext() (ctx context.Context, cleanup func()) { } func preCommand(ctx context.Context, cmdName model.TiltSubcommand) context.Context { + l := logger.NewLogger(logLevel(verbose, debug), os.Stdout) ctx = logger.WithLogger(ctx, l) @@ -122,6 +125,9 @@ func preCommand(ctx context.Context, cmdName model.TiltSubcommand) context.Conte ctx = tiltanalytics.WithAnalytics(ctx, a) + // Users don't care about controller-runtime logs. + ctrllog.SetLogger(logr.New(ctrllog.NullLogSink{})) + initKlog(l.Writer(logger.InfoLvl)) // SIGNAL TRAPPING