chore: still using zap.New as the default logger bootstrapper

Signed-off-by: STRRL <[email protected]>

Author: STRRL

go.mod

@@ -11,6 +11,7 @@ require (
 	github.com/onsi/gomega v1.18.1
 	github.com/prometheus/client_golang v1.12.1
 	github.com/prometheus/client_model v0.2.0
+	go.uber.org/atomic v1.7.0
 	go.uber.org/goleak v1.1.12
 	go.uber.org/zap v1.19.1
 	golang.org/x/sys v0.0.0-20220209214540-3681064d5158
@@ -57,7 +58,6 @@ require (
 	github.com/prometheus/common v0.32.1 // indirect
 	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.6.0 // indirect
 	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect

pkg/log/bootstrap/doc.go

@@ -28,6 +28,7 @@ import (
 	"github.com/go-logr/zapr"
 	"go.uber.org/zap"
 	"go.uber.org/zap/zapcore"
+	crlogr "sigs.k8s.io/controller-runtime/pkg/log/logr"
 )
 
 // EncoderConfigOption is a function that can modify a `zapcore.EncoderConfig`.
@@ -37,11 +38,18 @@ type EncoderConfigOption func(*zapcore.EncoderConfig)
 type NewEncoderFunc func(...EncoderConfigOption) zapcore.Encoder
 
 // New returns a brand new Logger configured with Opts. It
-// uses KubeAwareEncoder which adds Type information and
-// Namespace/Name to the log.
-// Deprecated: use bootstrap.New as instead.
+// uses KubeAwareLogger/KubeAwareEncoder which adds Type
+// information and Namespace/Name to the log.
 func New(opts ...Opts) logr.Logger {
-	return zapr.NewLogger(NewRaw(opts...))
+	zaprLogger := zapr.NewLogger(NewRaw(opts...))
+	o := &Options{}
+	for _, opt := range opts {
+		opt(o)
+	}
+	if o.UseKubeAwareEncoder {
+		return crlogr.NewKubeAwareLogger(zaprLogger, o.Development)
+	}
+	return zaprLogger
 }
 
 // Opts allows to manipulate Options.