Merge pull request #340 from huffmanca/move-to-klogv2

k8s-ci-robot · web-flow · commit d24d2b982007 · 2020-07-28T09:33:48.000-07:00
Move to klogv2
diff --git a/cmd/csi-snapshotter/main.go b/cmd/csi-snapshotter/main.go
@@ -31,7 +31,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/kubernetes-csi/csi-lib-utils/connection"
diff --git a/cmd/snapshot-controller/main.go b/cmd/snapshot-controller/main.go
@@ -28,7 +28,7 @@ import (
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 
 	"github.com/kubernetes-csi/csi-lib-utils/leaderelection"
 	controller "github.com/kubernetes-csi/external-snapshotter/v2/pkg/common-controller"
diff --git a/go.mod b/go.mod
@@ -18,7 +18,7 @@ require (
 	k8s.io/client-go v0.19.0-rc.2
 	k8s.io/code-generator v0.19.0-rc.2
 	k8s.io/component-base v0.19.0-rc.2
-	k8s.io/klog v1.0.0
+	k8s.io/klog/v2 v2.2.0
 )
 
 replace (
diff --git a/pkg/common-controller/framework_test.go b/pkg/common-controller/framework_test.go
@@ -52,7 +52,7 @@ import (
 	core "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 )
 
 // This is a unit test framework for snapshot controller.
diff --git a/pkg/common-controller/snapshot_controller.go b/pkg/common-controller/snapshot_controller.go
@@ -30,7 +30,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/kubernetes/scheme"
 	ref "k8s.io/client-go/tools/reference"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 
 	crdv1 "github.com/kubernetes-csi/external-snapshotter/v2/pkg/apis/volumesnapshot/v1beta1"
 	"github.com/kubernetes-csi/external-snapshotter/v2/pkg/utils"
diff --git a/pkg/common-controller/snapshot_controller_base.go b/pkg/common-controller/snapshot_controller_base.go
@@ -38,7 +38,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/workqueue"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 )
 
 type csiSnapshotCommonController struct {
diff --git a/pkg/metrics/metrics.go b/pkg/metrics/metrics.go
@@ -26,7 +26,7 @@ import (
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"k8s.io/apimachinery/pkg/types"
 	k8smetrics "k8s.io/component-base/metrics"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 )
 
 const (
diff --git a/pkg/sidecar-controller/framework_test.go b/pkg/sidecar-controller/framework_test.go
@@ -46,7 +46,7 @@ import (
 	core "k8s.io/client-go/testing"
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 )
 
 // This is a unit test framework for snapshot sidecar controller.
diff --git a/pkg/sidecar-controller/snapshot_controller.go b/pkg/sidecar-controller/snapshot_controller.go
@@ -29,7 +29,7 @@ import (
 	v1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/api/errors"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 )
 
 // Design:
diff --git a/pkg/sidecar-controller/snapshot_controller_base.go b/pkg/sidecar-controller/snapshot_controller_base.go
@@ -36,7 +36,7 @@ import (
 	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/record"
 	"k8s.io/client-go/util/workqueue"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 )
 
 type csiSnapshotSideCarController struct {
diff --git a/pkg/snapshotter/snapshotter.go b/pkg/snapshotter/snapshotter.go
@@ -27,7 +27,7 @@ import (
 
 	"google.golang.org/grpc"
 
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 )
 
 // Snapshotter implements CreateSnapshot/DeleteSnapshot operations against a remote CSI driver.
diff --git a/pkg/utils/util.go b/pkg/utils/util.go
@@ -32,7 +32,7 @@ import (
 	"k8s.io/apimachinery/pkg/util/validation"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/tools/cache"
-	"k8s.io/klog"
+	klog "k8s.io/klog/v2"
 )
 
 var (

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ require (`
`18`	`18`	`k8s.io/client-go v0.19.0-rc.2`
`19`	`19`	`k8s.io/code-generator v0.19.0-rc.2`
`20`	`20`	`k8s.io/component-base v0.19.0-rc.2`
`21`		`- k8s.io/klog v1.0.0`
	`21`	`+ k8s.io/klog/v2 v2.2.0`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`replace (`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ import (`
`52`	`52`	`core "k8s.io/client-go/testing"`
`53`	`53`	`"k8s.io/client-go/tools/cache"`
`54`	`54`	`"k8s.io/client-go/tools/record"`
`55`		`- "k8s.io/klog"`
	`55`	`+ klog "k8s.io/klog/v2"`
`56`	`56`	`)`
`57`	`57`
`58`	`58`	`// This is a unit test framework for snapshot controller.`
Original file line number	Diff line number	Diff line change
`@@ -38,7 +38,7 @@ import (`
`38`	`38`	`"k8s.io/client-go/tools/cache"`
`39`	`39`	`"k8s.io/client-go/tools/record"`
`40`	`40`	`"k8s.io/client-go/util/workqueue"`
`41`		`- "k8s.io/klog"`
	`41`	`+ klog "k8s.io/klog/v2"`
`42`	`42`	`)`
`43`	`43`
`44`	`44`	`type csiSnapshotCommonController struct {`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ import (`
`26`	`26`	`"github.com/prometheus/client_golang/prometheus/promhttp"`
`27`	`27`	`"k8s.io/apimachinery/pkg/types"`
`28`	`28`	`k8smetrics "k8s.io/component-base/metrics"`
`29`		`- "k8s.io/klog"`
	`29`	`+ klog "k8s.io/klog/v2"`
`30`	`30`	`)`
`31`	`31`
`32`	`32`	`const (`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ import (`
`46`	`46`	`core "k8s.io/client-go/testing"`
`47`	`47`	`"k8s.io/client-go/tools/cache"`
`48`	`48`	`"k8s.io/client-go/tools/record"`
`49`		`- "k8s.io/klog"`
	`49`	`+ klog "k8s.io/klog/v2"`
`50`	`50`	`)`
`51`	`51`
`52`	`52`	`// This is a unit test framework for snapshot sidecar controller.`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`v1 "k8s.io/api/core/v1"`
`30`	`30`	`"k8s.io/apimachinery/pkg/api/errors"`
`31`	`31`	`metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"`
`32`		`- "k8s.io/klog"`
	`32`	`+ klog "k8s.io/klog/v2"`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`// Design:`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ import (`
`36`	`36`	`"k8s.io/client-go/tools/cache"`
`37`	`37`	`"k8s.io/client-go/tools/record"`
`38`	`38`	`"k8s.io/client-go/util/workqueue"`
`39`		`- "k8s.io/klog"`
	`39`	`+ klog "k8s.io/klog/v2"`
`40`	`40`	`)`
`41`	`41`
`42`	`42`	`type csiSnapshotSideCarController struct {`