Merge pull request #334 from DirectXMan12/refactor/squash-runtime-log-references

k8s-ci-robot · web-flow · commit 89c373a86c19 · 2019-02-27T15:33:16.000-08:00
🐛 Squash some remaining references to runtime/log
diff --git 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
@@ -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) {

Original file line number	Diff line number	Diff line change
`@@ -25,8 +25,8 @@ import (`
`25`	`25`	`"k8s.io/client-go/kubernetes"`
`26`	`26`	`"k8s.io/client-go/rest"`
`27`	`27`	`"sigs.k8s.io/controller-runtime/pkg/envtest"`
	`28`	`+ logf "sigs.k8s.io/controller-runtime/pkg/log"`
`28`	`29`	`"sigs.k8s.io/controller-runtime/pkg/log/zap"`
`29`		`- logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`func TestSource(t *testing.T) {`