From 5b02cc2d2748bccf2dc406d5ac012915987ac42b Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Wed, 9 Jan 2019 14:24:53 -0800 Subject: [PATCH] Switch internals over to new logging pkg layout This switches everything except alias.go over to the new package layout (mainly having internals use pkg/internal/log, and examples use pkg/log). --- TMP-LOGGING.md | 4 ++-- example/main.go | 5 +++-- pkg/builder/builder_suite_test.go | 5 +++-- pkg/builder/example_test.go | 2 +- pkg/cache/cache.go | 4 ++-- pkg/cache/cache_suite_test.go | 5 +++-- pkg/client/client_suite_test.go | 5 +++-- pkg/client/config/config.go | 4 ++-- pkg/client/fake/client.go | 4 ++-- pkg/client/fake/client_suite_test.go | 5 +++-- pkg/controller/controller_suite_test.go | 5 +++-- pkg/controller/controllerutil/example_test.go | 2 +- pkg/controller/example_test.go | 2 +- pkg/envtest/envtest_suite_test.go | 5 +++-- pkg/handler/enqueue.go | 4 ++-- pkg/handler/enqueue_owner.go | 4 ++-- pkg/handler/eventhandler_suite_test.go | 5 +++-- pkg/internal/admission/http.go | 4 ++-- pkg/internal/controller/controller.go | 4 ++-- pkg/internal/controller/controller_suite_test.go | 5 +++-- pkg/internal/recorder/recorder_suite_test.go | 5 +++-- pkg/manager/example_test.go | 2 +- pkg/manager/internal.go | 4 ++-- pkg/manager/manager_suite_test.go | 5 +++-- pkg/predicate/predicate.go | 4 ++-- pkg/predicate/predicate_suite_test.go | 5 +++-- pkg/reconcile/reconcile_suite_test.go | 5 +++-- pkg/source/internal/eventsource.go | 4 ++-- pkg/source/internal/internal_suite_test.go | 5 +++-- pkg/source/source.go | 4 ++-- pkg/source/source_suite_test.go | 5 +++-- pkg/webhook/admission/admission_suite_test.go | 5 +++-- pkg/webhook/admission/doc.go | 4 ++-- pkg/webhook/doc.go | 4 ++-- pkg/webhook/internal/cert/generator/suite_test.go | 5 +++-- pkg/webhook/internal/cert/suite_test.go | 5 +++-- pkg/webhook/internal/cert/writer/doc.go | 4 ++-- pkg/webhook/internal/cert/writer/suite_test.go | 5 +++-- 38 files changed, 91 insertions(+), 72 deletions(-) diff --git a/TMP-LOGGING.md b/TMP-LOGGING.md index a6b6c619b5..2bb5dda888 100644 --- a/TMP-LOGGING.md +++ b/TMP-LOGGING.md @@ -48,11 +48,11 @@ provides some helpers to make it easy to use [Zap](https://go.uber.org/zap) as the implementation. You can configure the logging implementation using -`"sigs.k8s.io/controller-runtime/pkg/runtime/log".SetLogger`. That +`"sigs.k8s.io/controller-runtime/pkg/log".SetLogger`. That package also contains the convinience functions for setting up Zap. You can get a handle to the the "root" logger using -`"sigs.k8s.io/controller-runtime/pkg/runtime/log".Log`, and can then call +`"sigs.k8s.io/controller-runtime/pkg/log".Log`, and can then call `WithName` to create individual named loggers. You can call `WithName` repeatedly to chain names together: diff --git a/example/main.go b/example/main.go index fa3b52b89a..e0af176285 100644 --- a/example/main.go +++ b/example/main.go @@ -29,7 +29,8 @@ import ( "sigs.k8s.io/controller-runtime/pkg/controller" "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/manager" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" "sigs.k8s.io/controller-runtime/pkg/runtime/signals" "sigs.k8s.io/controller-runtime/pkg/source" "sigs.k8s.io/controller-runtime/pkg/webhook" @@ -44,7 +45,7 @@ func main() { "disable the installer in the webhook server, so it won't install webhook configuration resources during bootstrapping") flag.Parse() - logf.SetLogger(logf.ZapLogger(false)) + logf.SetLogger(zap.Logger(false)) entryLog := log.WithName("entrypoint") // Setup a Manager diff --git a/pkg/builder/builder_suite_test.go b/pkg/builder/builder_suite_test.go index 39d42eed6e..46ee514ac5 100644 --- a/pkg/builder/builder_suite_test.go +++ b/pkg/builder/builder_suite_test.go @@ -24,7 +24,8 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" "sigs.k8s.io/controller-runtime/pkg/metrics" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -36,7 +37,7 @@ var testenv *envtest.Environment var cfg *rest.Config var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) testenv = &envtest.Environment{} diff --git a/pkg/builder/example_test.go b/pkg/builder/example_test.go index a966eed456..00eafb0baf 100644 --- a/pkg/builder/example_test.go +++ b/pkg/builder/example_test.go @@ -21,7 +21,7 @@ import ( "fmt" "os" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/pkg/cache/cache.go b/pkg/cache/cache.go index cb87d8f385..c6f3e6971f 100644 --- a/pkg/cache/cache.go +++ b/pkg/cache/cache.go @@ -29,10 +29,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/cache/internal" "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" ) -var log = logf.KBLog.WithName("object-cache") +var log = logf.RuntimeLog.WithName("object-cache") // Cache implements CacheReader by reading objects from a cache populated by InformersMap type Cache interface { diff --git a/pkg/cache/cache_suite_test.go b/pkg/cache/cache_suite_test.go index 20736ab22c..1459a9178a 100644 --- a/pkg/cache/cache_suite_test.go +++ b/pkg/cache/cache_suite_test.go @@ -24,7 +24,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -37,7 +38,7 @@ var cfg *rest.Config var clientset *kubernetes.Clientset var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) testenv = &envtest.Environment{} diff --git a/pkg/client/client_suite_test.go b/pkg/client/client_suite_test.go index 0c9cc9d458..dbdafbfa86 100644 --- a/pkg/client/client_suite_test.go +++ b/pkg/client/client_suite_test.go @@ -25,7 +25,8 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -38,7 +39,7 @@ var cfg *rest.Config var clientset *kubernetes.Clientset var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) testenv = &envtest.Environment{} diff --git a/pkg/client/config/config.go b/pkg/client/config/config.go index a57d48767f..4ca4f20deb 100644 --- a/pkg/client/config/config.go +++ b/pkg/client/config/config.go @@ -25,12 +25,12 @@ import ( "k8s.io/client-go/rest" "k8s.io/client-go/tools/clientcmd" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" ) var ( kubeconfig, masterURL string - log = logf.KBLog.WithName("client").WithName("config") + log = logf.RuntimeLog.WithName("client").WithName("config") ) func init() { diff --git a/pkg/client/fake/client.go b/pkg/client/fake/client.go index 09055a5bac..ee5e537b93 100644 --- a/pkg/client/fake/client.go +++ b/pkg/client/fake/client.go @@ -31,11 +31,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client" "sigs.k8s.io/controller-runtime/pkg/client/apiutil" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" ) var ( - log = logf.KBLog.WithName("fake-client") + log = logf.RuntimeLog.WithName("fake-client") ) type fakeClient struct { diff --git a/pkg/client/fake/client_suite_test.go b/pkg/client/fake/client_suite_test.go index 7adea0cdda..7342148c47 100644 --- a/pkg/client/fake/client_suite_test.go +++ b/pkg/client/fake/client_suite_test.go @@ -23,7 +23,8 @@ import ( . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -32,6 +33,6 @@ func TestSource(t *testing.T) { } var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) close(done) }, 60) diff --git a/pkg/controller/controller_suite_test.go b/pkg/controller/controller_suite_test.go index 9749f99cb4..ec730a2168 100644 --- a/pkg/controller/controller_suite_test.go +++ b/pkg/controller/controller_suite_test.go @@ -25,7 +25,8 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" "sigs.k8s.io/controller-runtime/pkg/metrics" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -38,7 +39,7 @@ var cfg *rest.Config var clientset *kubernetes.Clientset var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) testenv = &envtest.Environment{} diff --git a/pkg/controller/controllerutil/example_test.go b/pkg/controller/controllerutil/example_test.go index 82bb067916..f340f623fc 100644 --- a/pkg/controller/controllerutil/example_test.go +++ b/pkg/controller/controllerutil/example_test.go @@ -25,7 +25,7 @@ import ( "k8s.io/apimachinery/pkg/runtime" "sigs.k8s.io/controller-runtime/pkg/controller/controllerutil" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" ) var ( diff --git a/pkg/controller/example_test.go b/pkg/controller/example_test.go index 2628822075..4c2a0de947 100644 --- a/pkg/controller/example_test.go +++ b/pkg/controller/example_test.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/manager" "sigs.k8s.io/controller-runtime/pkg/reconcile" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/runtime/signals" "sigs.k8s.io/controller-runtime/pkg/source" ) diff --git a/pkg/envtest/envtest_suite_test.go b/pkg/envtest/envtest_suite_test.go index a8c4c32f3b..46aba52138 100644 --- a/pkg/envtest/envtest_suite_test.go +++ b/pkg/envtest/envtest_suite_test.go @@ -21,7 +21,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -32,7 +33,7 @@ func TestSource(t *testing.T) { var env *Environment var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) env = &Environment{} _, err := env.Start() Expect(err).NotTo(HaveOccurred()) diff --git a/pkg/handler/enqueue.go b/pkg/handler/enqueue.go index 9ddda5be6e..2d0d4a6bda 100644 --- a/pkg/handler/enqueue.go +++ b/pkg/handler/enqueue.go @@ -21,10 +21,10 @@ import ( "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" ) -var enqueueLog = logf.KBLog.WithName("eventhandler").WithName("EnqueueRequestForObject") +var enqueueLog = logf.RuntimeLog.WithName("eventhandler").WithName("EnqueueRequestForObject") var _ EventHandler = &EnqueueRequestForObject{} diff --git a/pkg/handler/enqueue_owner.go b/pkg/handler/enqueue_owner.go index a5b1076808..2e0b492803 100644 --- a/pkg/handler/enqueue_owner.go +++ b/pkg/handler/enqueue_owner.go @@ -27,12 +27,12 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/runtime/inject" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" ) var _ EventHandler = &EnqueueRequestForOwner{} -var log = logf.KBLog.WithName("eventhandler").WithName("EnqueueRequestForOwner") +var log = logf.RuntimeLog.WithName("eventhandler").WithName("EnqueueRequestForOwner") // EnqueueRequestForOwner enqueues Requests for the Owners of an object. E.g. the object that created // the object that was the source of the Event. diff --git a/pkg/handler/eventhandler_suite_test.go b/pkg/handler/eventhandler_suite_test.go index ee824d35d0..7fd222e590 100644 --- a/pkg/handler/eventhandler_suite_test.go +++ b/pkg/handler/eventhandler_suite_test.go @@ -22,7 +22,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestEventhandler(t *testing.T) { @@ -31,5 +32,5 @@ func TestEventhandler(t *testing.T) { } var _ = BeforeSuite(func() { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) }) diff --git a/pkg/internal/admission/http.go b/pkg/internal/admission/http.go index b1ae833108..49ddb4ad16 100644 --- a/pkg/internal/admission/http.go +++ b/pkg/internal/admission/http.go @@ -23,12 +23,12 @@ import ( "k8s.io/api/admission/v1beta1" "k8s.io/apimachinery/pkg/runtime" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" ) var ( // TODO(directxman12): this shouldn't be a global log - log = logf.KBLog.WithName("admission").WithName("http-handler") + log = logf.RuntimeLog.WithName("admission").WithName("http-handler") ) func (h httpHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) { diff --git a/pkg/internal/controller/controller.go b/pkg/internal/controller/controller.go index 6a44ea9fc3..cbf01de149 100644 --- a/pkg/internal/controller/controller.go +++ b/pkg/internal/controller/controller.go @@ -34,11 +34,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" "sigs.k8s.io/controller-runtime/pkg/reconcile" "sigs.k8s.io/controller-runtime/pkg/runtime/inject" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" "sigs.k8s.io/controller-runtime/pkg/source" ) -var log = logf.KBLog.WithName("controller") +var log = logf.RuntimeLog.WithName("controller") var _ inject.Injector = &Controller{} diff --git a/pkg/internal/controller/controller_suite_test.go b/pkg/internal/controller/controller_suite_test.go index 9efb85391e..36cb52559f 100644 --- a/pkg/internal/controller/controller_suite_test.go +++ b/pkg/internal/controller/controller_suite_test.go @@ -24,7 +24,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -37,7 +38,7 @@ var cfg *rest.Config var clientset *kubernetes.Clientset var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) testenv = &envtest.Environment{} diff --git a/pkg/internal/recorder/recorder_suite_test.go b/pkg/internal/recorder/recorder_suite_test.go index b8666a3391..d50270604b 100644 --- a/pkg/internal/recorder/recorder_suite_test.go +++ b/pkg/internal/recorder/recorder_suite_test.go @@ -24,7 +24,8 @@ import ( "k8s.io/client-go/kubernetes" "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestRecorder(t *testing.T) { @@ -37,7 +38,7 @@ var cfg *rest.Config var clientset *kubernetes.Clientset var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) testenv = &envtest.Environment{} diff --git a/pkg/manager/example_test.go b/pkg/manager/example_test.go index 76d585a18d..f718b38f8e 100644 --- a/pkg/manager/example_test.go +++ b/pkg/manager/example_test.go @@ -21,7 +21,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/controller-runtime/pkg/manager" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" "sigs.k8s.io/controller-runtime/pkg/runtime/signals" ) diff --git a/pkg/manager/internal.go b/pkg/manager/internal.go index fd04e8fb54..f828b2f284 100644 --- a/pkg/manager/internal.go +++ b/pkg/manager/internal.go @@ -36,11 +36,11 @@ import ( "sigs.k8s.io/controller-runtime/pkg/metrics" "sigs.k8s.io/controller-runtime/pkg/recorder" "sigs.k8s.io/controller-runtime/pkg/runtime/inject" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" "sigs.k8s.io/controller-runtime/pkg/webhook/admission/types" ) -var log = logf.KBLog.WithName("manager") +var log = logf.RuntimeLog.WithName("manager") type controllerManager struct { // config is the rest.config used to talk to the apiserver. Required. diff --git a/pkg/manager/manager_suite_test.go b/pkg/manager/manager_suite_test.go index b8d8b33f06..a1183f66c0 100644 --- a/pkg/manager/manager_suite_test.go +++ b/pkg/manager/manager_suite_test.go @@ -25,7 +25,8 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/envtest" "sigs.k8s.io/controller-runtime/pkg/metrics" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -38,7 +39,7 @@ var cfg *rest.Config var clientset *kubernetes.Clientset var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) testenv = &envtest.Environment{} diff --git a/pkg/predicate/predicate.go b/pkg/predicate/predicate.go index 99a4f9d93a..9542d4a1c0 100644 --- a/pkg/predicate/predicate.go +++ b/pkg/predicate/predicate.go @@ -18,10 +18,10 @@ package predicate import ( "sigs.k8s.io/controller-runtime/pkg/event" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" ) -var log = logf.KBLog.WithName("predicate").WithName("eventFilters") +var log = logf.RuntimeLog.WithName("predicate").WithName("eventFilters") // Predicate filters events before enqueuing the keys. type Predicate interface { diff --git a/pkg/predicate/predicate_suite_test.go b/pkg/predicate/predicate_suite_test.go index fc8713e40e..15ee76ffef 100644 --- a/pkg/predicate/predicate_suite_test.go +++ b/pkg/predicate/predicate_suite_test.go @@ -22,7 +22,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestPredicate(t *testing.T) { @@ -31,5 +32,5 @@ func TestPredicate(t *testing.T) { } var _ = BeforeSuite(func() { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) }) diff --git a/pkg/reconcile/reconcile_suite_test.go b/pkg/reconcile/reconcile_suite_test.go index 7c88fb6ab6..f9fbba4b32 100644 --- a/pkg/reconcile/reconcile_suite_test.go +++ b/pkg/reconcile/reconcile_suite_test.go @@ -22,7 +22,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestReconcile(t *testing.T) { @@ -31,5 +32,5 @@ func TestReconcile(t *testing.T) { } var _ = BeforeSuite(func() { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) }) diff --git a/pkg/source/internal/eventsource.go b/pkg/source/internal/eventsource.go index 6ced9f4eff..ae220fc882 100644 --- a/pkg/source/internal/eventsource.go +++ b/pkg/source/internal/eventsource.go @@ -25,13 +25,13 @@ import ( "k8s.io/client-go/util/workqueue" "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/handler" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "sigs.k8s.io/controller-runtime/pkg/predicate" ) -var log = logf.KBLog.WithName("source").WithName("EventHandler") +var log = logf.RuntimeLog.WithName("source").WithName("EventHandler") var _ cache.ResourceEventHandler = EventHandler{} diff --git a/pkg/source/internal/internal_suite_test.go b/pkg/source/internal/internal_suite_test.go index 866df19cd2..53848f2db7 100644 --- a/pkg/source/internal/internal_suite_test.go +++ b/pkg/source/internal/internal_suite_test.go @@ -22,7 +22,8 @@ import ( . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestInternal(t *testing.T) { @@ -31,5 +32,5 @@ func TestInternal(t *testing.T) { } var _ = BeforeSuite(func() { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) }) diff --git a/pkg/source/source.go b/pkg/source/source.go index cd7bef798f..3375616e1d 100644 --- a/pkg/source/source.go +++ b/pkg/source/source.go @@ -26,7 +26,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/event" "sigs.k8s.io/controller-runtime/pkg/handler" "sigs.k8s.io/controller-runtime/pkg/runtime/inject" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" "sigs.k8s.io/controller-runtime/pkg/source/internal" toolscache "k8s.io/client-go/tools/cache" @@ -34,7 +34,7 @@ import ( "sigs.k8s.io/controller-runtime/pkg/predicate" ) -var log = logf.KBLog.WithName("source") +var log = logf.RuntimeLog.WithName("source") const ( // defaultBufferSize is the default number of event notifications that can be buffered. diff --git a/pkg/source/source_suite_test.go b/pkg/source/source_suite_test.go index ccd6697ba0..0a45a0e1b1 100644 --- a/pkg/source/source_suite_test.go +++ b/pkg/source/source_suite_test.go @@ -25,7 +25,8 @@ import ( "k8s.io/client-go/rest" "sigs.k8s.io/controller-runtime/pkg/cache" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -41,7 +42,7 @@ var stop chan struct{} var _ = BeforeSuite(func(done Done) { stop = make(chan struct{}) - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) testenv = &envtest.Environment{} diff --git a/pkg/webhook/admission/admission_suite_test.go b/pkg/webhook/admission/admission_suite_test.go index 6d34d165a4..42323177e6 100644 --- a/pkg/webhook/admission/admission_suite_test.go +++ b/pkg/webhook/admission/admission_suite_test.go @@ -23,7 +23,8 @@ import ( . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestAdmissionWebhook(t *testing.T) { @@ -32,7 +33,7 @@ func TestAdmissionWebhook(t *testing.T) { } var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) close(done) }, 60) diff --git a/pkg/webhook/admission/doc.go b/pkg/webhook/admission/doc.go index 44a2b15294..0126aad03a 100644 --- a/pkg/webhook/admission/doc.go +++ b/pkg/webhook/admission/doc.go @@ -95,7 +95,7 @@ The following snippet is an example implementation of validating handler. package admission import ( - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" ) -var log = logf.KBLog.WithName("admission") +var log = logf.RuntimeLog.WithName("admission") diff --git a/pkg/webhook/doc.go b/pkg/webhook/doc.go index 2c9eba2a3d..930df1e436 100644 --- a/pkg/webhook/doc.go +++ b/pkg/webhook/doc.go @@ -88,7 +88,7 @@ Start the server by starting the manager package webhook import ( - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" ) -var log = logf.KBLog.WithName("webhook") +var log = logf.RuntimeLog.WithName("webhook") diff --git a/pkg/webhook/internal/cert/generator/suite_test.go b/pkg/webhook/internal/cert/generator/suite_test.go index 89af8a8562..1b232a6525 100644 --- a/pkg/webhook/internal/cert/generator/suite_test.go +++ b/pkg/webhook/internal/cert/generator/suite_test.go @@ -23,7 +23,8 @@ import ( . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -32,6 +33,6 @@ func TestSource(t *testing.T) { } var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) close(done) }, 60) diff --git a/pkg/webhook/internal/cert/suite_test.go b/pkg/webhook/internal/cert/suite_test.go index 98064687ab..6762ada6a5 100644 --- a/pkg/webhook/internal/cert/suite_test.go +++ b/pkg/webhook/internal/cert/suite_test.go @@ -23,7 +23,8 @@ import ( . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -32,6 +33,6 @@ func TestSource(t *testing.T) { } var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) close(done) }, 60) diff --git a/pkg/webhook/internal/cert/writer/doc.go b/pkg/webhook/internal/cert/writer/doc.go index 91aa07ae4a..425626606c 100644 --- a/pkg/webhook/internal/cert/writer/doc.go +++ b/pkg/webhook/internal/cert/writer/doc.go @@ -58,7 +58,7 @@ Inject necessary information given the objects. package writer import ( - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" ) -var log = logf.KBLog.WithName("admission").WithName("cert").WithName("writer") +var log = logf.RuntimeLog.WithName("admission").WithName("cert").WithName("writer") diff --git a/pkg/webhook/internal/cert/writer/suite_test.go b/pkg/webhook/internal/cert/writer/suite_test.go index 67b96bca82..968ca8b67a 100644 --- a/pkg/webhook/internal/cert/writer/suite_test.go +++ b/pkg/webhook/internal/cert/writer/suite_test.go @@ -23,7 +23,8 @@ import ( . "github.com/onsi/gomega" "sigs.k8s.io/controller-runtime/pkg/envtest" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/log" + "sigs.k8s.io/controller-runtime/pkg/log/zap" ) func TestSource(t *testing.T) { @@ -32,6 +33,6 @@ func TestSource(t *testing.T) { } var _ = BeforeSuite(func(done Done) { - logf.SetLogger(logf.ZapLoggerTo(GinkgoWriter, true)) + logf.SetLogger(zap.LoggerTo(GinkgoWriter, true)) close(done) }, 60)