From 140b2812383d516c51f74074837afd88fd7612af Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Wed, 9 Jan 2019 14:26:52 -0800 Subject: [PATCH] Switch alias.go to new logging pkg layout This switches alias.go over to the new logging layout. In order to avoid alias.go pulling in Zap, we don't put ZapLogger in alias.go any more. Practically, this is probably fine. It means an extra line in main.go, but it's just one, and allows people to avoid extraneous dependencies. --- alias.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/alias.go b/alias.go index d5a21b1f38..da85ceeb28 100644 --- a/alias.go +++ b/alias.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - "sigs.k8s.io/controller-runtime/pkg/runtime/log" + "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/runtime/scheme" "sigs.k8s.io/controller-runtime/pkg/runtime/signals" ) @@ -126,10 +126,4 @@ var ( // SetLogger sets a concrete logging implementation for all deferred Loggers. SetLogger = log.SetLogger - - // ZapLogger is a Logger implementation. - // If development is true, a Zap development config will be used - // (stacktraces on warnings, no sampling), otherwise a Zap production - // config will be used (stacktraces on errors, sampling). - ZapLogger = log.ZapLogger )