From 9ff51573572cf92d22dddf12ba1036f242106bda Mon Sep 17 00:00:00 2001 From: Solly Ross Date: Thu, 21 Feb 2019 19:00:52 -0800 Subject: [PATCH] Squash some remaining references to runtime/log This squashes some remaining references to runtime/log, which would have forced pulling in Zap. --- pkg/envtest/server.go | 4 ++-- pkg/webhook/webhook_suite_test.go | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/envtest/server.go b/pkg/envtest/server.go index 8834be741d..2204831bf7 100644 --- a/pkg/envtest/server.go +++ b/pkg/envtest/server.go @@ -27,10 +27,10 @@ import ( "sigs.k8s.io/controller-runtime/pkg/client/config" "sigs.k8s.io/testing_frameworks/integration" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + logf "sigs.k8s.io/controller-runtime/pkg/internal/log" ) -var log = logf.KBLog.WithName("test-env") +var log = logf.RuntimeLog.WithName("test-env") // Default binary path for test framework const ( diff --git a/pkg/webhook/webhook_suite_test.go b/pkg/webhook/webhook_suite_test.go index 70176e7d07..053df0b76c 100644 --- a/pkg/webhook/webhook_suite_test.go +++ b/pkg/webhook/webhook_suite_test.go @@ -25,8 +25,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/log" "sigs.k8s.io/controller-runtime/pkg/log/zap" - logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" ) func TestSource(t *testing.T) {