From 0a4462066f108a1ed22cf94eeb84d2c38da245cd Mon Sep 17 00:00:00 2001 From: Camila Macedo Date: Fri, 17 Jan 2020 17:49:16 +0000 Subject: [PATCH] replace pkg/runtime/log for pkg/log in just the v2 scaffolding. --- pkg/scaffold/v2/webhook/webhook.go | 2 +- testdata/project-v2-multigroup/apis/crew/v1/captain_webhook.go | 2 +- .../project-v2-multigroup/apis/ship/v1beta1/frigate_webhook.go | 2 +- testdata/project-v2/api/v1/captain_webhook.go | 2 +- testdata/project-v2/api/v1/firstmate_webhook.go | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkg/scaffold/v2/webhook/webhook.go b/pkg/scaffold/v2/webhook/webhook.go index ed4144d6eb7..cb9ec5ca1a6 100644 --- 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 index d4b6525fb68..6f206e0f7e5 100644 --- 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 index 8f26a409b2f..06327f54b3d 100644 --- 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 index d4b6525fb68..6f206e0f7e5 100644 --- 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 index 2f1bbc3a2d1..703a865c107 100644 --- 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.