build: update to klog/v2

Although klog and klog/v2 can be used in the same binary, extra work is needed to ensure that log levels are in sync. It's better to migrate all components to klog/v2, starting with leaf dependencies like csi-lib-utils.
kubernetes-csi · Oct 9, 2020 · 55472ad · 55472ad
1 parent 0cda52c
commit 55472ad
Show file tree

Hide file tree

Showing 20 changed files with 6 additions and 1,841 deletions.
diff --git a/connection/connection.go b/connection/connection.go
@@ -27,7 +27,7 @@ import (
 	"github.com/kubernetes-csi/csi-lib-utils/metrics"
 	"github.com/kubernetes-csi/csi-lib-utils/protosanitizer"
 	"google.golang.org/grpc"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 const (

diff --git a/deprecatedflags/deprecatedflags.go b/deprecatedflags/deprecatedflags.go
@@ -21,7 +21,7 @@ package deprecatedflags
 import (
 	"flag"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // Add defines a deprecated option which used to take some kind of

diff --git a/go.mod b/go.mod
@@ -11,7 +11,7 @@ require (
 	k8s.io/api v0.19.0
 	k8s.io/client-go v0.19.0
 	k8s.io/component-base v0.19.0
-	k8s.io/klog v1.0.0
+	k8s.io/klog/v2 v2.2.0
 )
 
 replace k8s.io/api => k8s.io/api v0.19.0

diff --git a/go.sum b/go.sum
@@ -430,8 +430,6 @@ k8s.io/client-go v0.19.0/go.mod h1:H9E/VT95blcFQnlyShFgnFT9ZnJOAceiUHM3MlRC+mU=
 k8s.io/component-base v0.19.0 h1:OueXf1q3RW7NlLlUCj2Dimwt7E1ys6ZqRnq53l2YuoE=
 k8s.io/component-base v0.19.0/go.mod h1:dKsY8BxkA+9dZIAh2aWJLL/UdASFDNtGYTCItL4LM7Y=
 k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0=
-k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8=
-k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I=
 k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
 k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A=
 k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y=

diff --git a/leaderelection/leader_election.go b/leaderelection/leader_election.go
@@ -32,7 +32,7 @@ import (
 	"k8s.io/client-go/tools/leaderelection"
 	"k8s.io/client-go/tools/leaderelection/resourcelock"
 	"k8s.io/client-go/tools/record"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 const (

diff --git a/metrics/metrics.go b/metrics/metrics.go
@@ -27,7 +27,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"k8s.io/component-base/metrics"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 const (

diff --git a/rpc/common.go b/rpc/common.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 const (

diff --git a/vendor/k8s.io/klog/.travis.yml b/vendor/k8s.io/klog/.travis.yml
diff --git a/vendor/k8s.io/klog/CONTRIBUTING.md b/vendor/k8s.io/klog/CONTRIBUTING.md
diff --git a/vendor/k8s.io/klog/LICENSE b/vendor/k8s.io/klog/LICENSE
diff --git a/vendor/k8s.io/klog/OWNERS b/vendor/k8s.io/klog/OWNERS
-Original file line number
+Diff line change
@@ Expand Up / @@ -27,7 +27,7 @@ import ( @@
     	"github.com/container-storage-interface/spec/lib/go/csi"
-    	"k8s.io/klog"
+    	"k8s.io/klog/v2"
     )
     const (
@@ Expand Down @@