Merge pull request #1326 from camilamacedo86/fix-issue

k8s-ci-robot · web-flow · commit 52db7c3098a4 · 2020-01-17T12:27:18.000-08:00
🐛 replace pkg/runtime/log for pkg/log in just the v2 scaffolding.
diff --git a/pkg/scaffold/v2/webhook/webhook.go b/pkg/scaffold/v2/webhook/webhook.go
@@ -96,7 +96,7 @@ package {{ .Resource.Version }}
 
 import (
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	{{- if or .Validating .Defaulting }}
 	"k8s.io/apimachinery/pkg/runtime"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
diff --git a/testdata/project-v2-multigroup/apis/crew/v1/captain_webhook.go b/testdata/project-v2-multigroup/apis/crew/v1/captain_webhook.go
@@ -19,7 +19,7 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
diff --git a/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_webhook.go b/testdata/project-v2-multigroup/apis/ship/v1beta1/frigate_webhook.go
@@ -18,7 +18,7 @@ package v1beta1
 
 import (
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 // log is for logging in this package.
diff --git a/testdata/project-v2/api/v1/captain_webhook.go b/testdata/project-v2/api/v1/captain_webhook.go
@@ -19,7 +19,7 @@ package v1
 import (
 	"k8s.io/apimachinery/pkg/runtime"
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 )
 
diff --git a/testdata/project-v2/api/v1/firstmate_webhook.go b/testdata/project-v2/api/v1/firstmate_webhook.go
@@ -18,7 +18,7 @@ package v1
 
 import (
 	ctrl "sigs.k8s.io/controller-runtime"
-	logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"
+	logf "sigs.k8s.io/controller-runtime/pkg/log"
 )
 
 // log is for logging in this package.

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package v1`
`19`	`19`	`import (`
`20`	`20`	`"k8s.io/apimachinery/pkg/runtime"`
`21`	`21`	`ctrl "sigs.k8s.io/controller-runtime"`
`22`		`- logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"`
	`22`	`+ logf "sigs.k8s.io/controller-runtime/pkg/log"`
`23`	`23`	`"sigs.k8s.io/controller-runtime/pkg/webhook"`
`24`	`24`	`)`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ package v1beta1`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`ctrl "sigs.k8s.io/controller-runtime"`
`21`		`- logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"`
	`21`	`+ logf "sigs.k8s.io/controller-runtime/pkg/log"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// log is for logging in this package.`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ package v1`
`18`	`18`
`19`	`19`	`import (`
`20`	`20`	`ctrl "sigs.k8s.io/controller-runtime"`
`21`		`- logf "sigs.k8s.io/controller-runtime/pkg/runtime/log"`
	`21`	`+ logf "sigs.k8s.io/controller-runtime/pkg/log"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// log is for logging in this package.`