Fix log formatting on startup logs

pkg/operator/injection/injection.go

@@ -26,7 +26,6 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/cache"
-	"knative.dev/pkg/logging"
 	"knative.dev/pkg/system"
 
 	"github.com/aws/karpenter-core/pkg/apis/settings"
@@ -85,7 +84,6 @@ func WithSettingsOrDie(ctx context.Context, kubernetesInterface kubernetes.Inter
 	cancelCtx, cancel := context.WithCancel(ctx)
 	defer cancel()
 
-	logging.FromContext(ctx).Debugf("waiting for configmaps")
 	factory := informers.NewSharedInformerFactoryWithOptions(kubernetesInterface, time.Second*30, informers.WithNamespace(system.Namespace()))
 	informer := factory.Core().V1().ConfigMaps().Informer()
 	factory.Start(cancelCtx.Done())

pkg/operator/logger.go

@@ -16,27 +16,40 @@ package operator
 
 import (
 	"context"
+	"log"
 
 	"github.com/go-logr/logr"
+	"github.com/go-logr/zapr"
 	"go.uber.org/zap"
+	"go.uber.org/zap/zapio"
 	"k8s.io/client-go/rest"
+	"k8s.io/klog/v2"
 	"knative.dev/pkg/configmap/informer"
 	"knative.dev/pkg/injection"
 	"knative.dev/pkg/injection/sharedmain"
 	"knative.dev/pkg/logging"
 )
 
-// LoggingContextOrDie injects a logger into the returned context. The logger is
+// NewLogger returns a configured *zap.SugaredLogger. The logger is
 // configured by the ConfigMap `config-logging` and live updates the level.
 func NewLogger(ctx context.Context, componentName string, config *rest.Config, cmw *informer.InformedWatcher) *zap.SugaredLogger {
-	ctx, startinformers := injection.EnableInjectionOrDie(ctx, config)
+	ctx, startInformers := injection.EnableInjectionOrDie(logging.WithLogger(ctx, zap.S()), config)
 	logger, atomicLevel := sharedmain.SetupLoggerOrDie(ctx, componentName)
 	rest.SetDefaultWarningHandler(&logging.WarningHandler{Logger: logger})
 	sharedmain.WatchLoggingConfigOrDie(ctx, cmw, logger, atomicLevel, componentName)
-	startinformers()
+	startInformers()
 	return logger
 }
 
+// ConfigureGlobalLoggers sets up any package-wide loggers like "log" or "klog" that are utilized by other packages
+// to use the configured *zap.SugaredLogger from the context
+func ConfigureGlobalLoggers(ctx context.Context) {
+	klog.SetLogger(zapr.NewLogger(logging.FromContext(ctx).Desugar()))
+	w := &zapio.Writer{Log: logging.FromContext(ctx).Desugar()}
+	log.SetFlags(0)
+	log.SetOutput(w)
+}
+
 type ignoreDebugEventsSink struct {
 	name string
 	sink logr.LogSink

pkg/operator/operator.go

@@ -96,6 +96,7 @@ func NewOperator() (context.Context, *Operator) {
 	// Logging
 	logger := NewLogger(ctx, component, config, configMapWatcher)
 	ctx = logging.WithLogger(ctx, logger)
+	ConfigureGlobalLoggers(ctx)
 
 	// Inject settings from the ConfigMap(s) into the context
 	ctx = injection.WithSettingsOrDie(ctx, kubernetesInterface, apis.Settings...)