fix: logging missing due to klog/v2 change

ZeroMagic · ZeroMagic · commit 24f8d984029f · 2020-07-13T07:37:39.000Z
Signed-off-by: ZeroMagic &lt;jiliu8@microsoft.com&gt;
diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	k8s.io/apimachinery v0.18.1
 	k8s.io/client-go v0.18.1
 	k8s.io/component-base v0.18.1
-	k8s.io/klog v1.0.0
+	k8s.io/klog/v2 v2.2.0
 	k8s.io/kubernetes v1.18.5
 	k8s.io/legacy-cloud-providers v0.0.0
 	k8s.io/utils v0.0.0-20200619165400-6e3d28b6ed19
diff --git a/pkg/blobfuse/azure.go b/pkg/blobfuse/azure.go
@@ -29,7 +29,7 @@ import (
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	azureprovider "k8s.io/legacy-cloud-providers/azure"
 
 	"golang.org/x/net/context"
diff --git a/pkg/blobfuse/blobfuse.go b/pkg/blobfuse/blobfuse.go
@@ -25,7 +25,7 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/pborman/uuid"
 	"golang.org/x/net/context"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	k8sutil "k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/legacy-cloud-providers/azure"
 	utilexec "k8s.io/utils/exec"
diff --git a/pkg/blobfuse/controllerserver.go b/pkg/blobfuse/controllerserver.go
@@ -29,7 +29,7 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 const blobfuseAccountNamePrefix = "fuse"
diff --git a/pkg/blobfuse/identityserver.go b/pkg/blobfuse/identityserver.go
@@ -24,7 +24,7 @@ import (
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"github.com/golang/protobuf/ptypes/wrappers"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // GetPluginInfo return the version and name of the plugin
diff --git a/pkg/blobfuse/nodeserver.go b/pkg/blobfuse/nodeserver.go
@@ -27,7 +27,7 @@ import (
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/kubernetes/pkg/volume/util"
 	"k8s.io/utils/mount"
 
diff --git a/pkg/blobfuseplugin/main.go b/pkg/blobfuseplugin/main.go
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/blobfuse-csi-driver/pkg/blobfuse"
 
 	"k8s.io/component-base/metrics/legacyregistry"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 func init() {
diff --git a/pkg/csi-common/controllerserver-default.go b/pkg/csi-common/controllerserver-default.go
@@ -17,7 +17,7 @@ limitations under the License.
 package csicommon
 
 import (
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"golang.org/x/net/context"
diff --git a/pkg/csi-common/driver.go b/pkg/csi-common/driver.go
@@ -18,7 +18,7 @@ package csicommon
 
 import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/pkg/csi-common/identityserver-default.go b/pkg/csi-common/identityserver-default.go
@@ -21,7 +21,7 @@ import (
 	"golang.org/x/net/context"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 type DefaultIdentityServer struct {
diff --git a/pkg/csi-common/nodeserver-default.go b/pkg/csi-common/nodeserver-default.go
@@ -19,7 +19,7 @@ package csicommon
 import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"golang.org/x/net/context"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 type DefaultNodeServer struct {
diff --git a/pkg/csi-common/server.go b/pkg/csi-common/server.go
@@ -22,7 +22,7 @@ import (
 	"sync"
 
 	"google.golang.org/grpc"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 )
diff --git a/pkg/csi-common/utils.go b/pkg/csi-common/utils.go
@@ -24,7 +24,7 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 func ParseEndpoint(ep string) (string, string, error) {
diff --git a/pkg/csi-common/utils_test.go b/pkg/csi-common/utils_test.go
@@ -22,7 +22,7 @@ import (
 	"flag"
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"google.golang.org/grpc"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"testing"
 
 	"github.com/stretchr/testify/assert"

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ import (`
`29`	`29`	`"google.golang.org/grpc/codes"`
`30`	`30`	`"google.golang.org/grpc/status"`
`31`	`31`	`"k8s.io/apimachinery/pkg/util/wait"`
`32`		`- "k8s.io/klog"`
	`32`	`+ "k8s.io/klog/v2"`
`33`	`33`	`)`
`34`	`34`
`35`	`35`	`const blobfuseAccountNamePrefix = "fuse"`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`
`25`	`25`	`"github.com/container-storage-interface/spec/lib/go/csi"`
`26`	`26`	`"github.com/golang/protobuf/ptypes/wrappers"`
`27`		`- "k8s.io/klog"`
	`27`	`+ "k8s.io/klog/v2"`
`28`	`28`	`)`
`29`	`29`
`30`	`30`	`// GetPluginInfo return the version and name of the plugin`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ import (`
`28`	`28`	`"sigs.k8s.io/blobfuse-csi-driver/pkg/blobfuse"`
`29`	`29`
`30`	`30`	`"k8s.io/component-base/metrics/legacyregistry"`
`31`		`- "k8s.io/klog"`
	`31`	`+ "k8s.io/klog/v2"`
`32`	`32`	`)`
`33`	`33`
`34`	`34`	`func init() {`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ import (`
`21`	`21`	`"golang.org/x/net/context"`
`22`	`22`	`"google.golang.org/grpc/codes"`
`23`	`23`	`"google.golang.org/grpc/status"`
`24`		`- "k8s.io/klog"`
	`24`	`+ "k8s.io/klog/v2"`
`25`	`25`	`)`
`26`	`26`
`27`	`27`	`type DefaultIdentityServer struct {`