Merge pull request #57 from andyzhangx/klog-v2

andyzhangx · web-flow · commit e19e97e2531d · 2020-07-10T10:15:48.000+08:00
chore: move to klog/v2
diff --git a/deploy/example/smb-provisioner/smb-server.yaml b/deploy/example/smb-provisioner/smb-server.yaml
@@ -6,7 +6,7 @@ metadata:
   labels:
     app: smb-server
 spec:
-  type: ClusterIP # use "LoadBalancer" to get a public ip
+  type: ClusterIP  # use "LoadBalancer" to get a public ip
   selector:
     app: smb-server
   ports:
diff --git a/go.mod b/go.mod
@@ -19,7 +19,7 @@ require (
 	golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e
 	google.golang.org/grpc v1.27.0
 	k8s.io/apimachinery v0.18.2-beta.0
-	k8s.io/klog v1.0.0
+	k8s.io/klog/v2 v2.2.0
 	k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4
 	sigs.k8s.io/yaml v1.2.0
 )
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
@@ -24,7 +24,7 @@ import (
 	"time"
 
 	"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
@@ -21,7 +21,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"
 	"regexp"
 	"strings"
 )
diff --git a/pkg/csi-common/utils_test.go b/pkg/csi-common/utils_test.go
@@ -21,7 +21,7 @@ import (
 	"context"
 	"flag"
 	"google.golang.org/grpc"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"testing"
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
diff --git a/pkg/mounter/safe_mounter_windows.go b/pkg/mounter/safe_mounter_windows.go
@@ -31,7 +31,7 @@ import (
 	smbv1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/smb/v1alpha1"
 	smbclientv1alpha1 "github.com/kubernetes-csi/csi-proxy/client/groups/smb/v1alpha1"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	utilexec "k8s.io/utils/exec"
 	"k8s.io/utils/mount"
 )
diff --git a/pkg/smb/controllerserver.go b/pkg/smb/controllerserver.go
@@ -22,7 +22,7 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 // CreateVolume not implemented, only for sanity test pass
diff --git a/pkg/smb/identityserver.go b/pkg/smb/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/smb/nodeserver.go b/pkg/smb/nodeserver.go
@@ -28,7 +28,7 @@ import (
 	"github.com/container-storage-interface/spec/lib/go/csi"
 
 	"k8s.io/apimachinery/pkg/util/wait"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/status"
diff --git a/pkg/smb/smb.go b/pkg/smb/smb.go
@@ -21,7 +21,7 @@ import (
 
 	"github.com/container-storage-interface/spec/lib/go/csi"
 
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/mount"
 
 	csicommon "github.com/kubernetes-csi/csi-driver-smb/pkg/csi-common"
diff --git a/pkg/smb/smb_common_windows.go b/pkg/smb/smb_common_windows.go
@@ -22,7 +22,7 @@ import (
 	"fmt"
 
 	"github.com/kubernetes-csi/csi-driver-smb/pkg/mounter"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 	"k8s.io/utils/mount"
 )
 
diff --git a/pkg/smbplugin/main.go b/pkg/smbplugin/main.go
@@ -28,7 +28,7 @@ import (
 	"github.com/kubernetes-csi/csi-driver-smb/pkg/smb"
 
 	"github.com/prometheus/client_golang/prometheus/promhttp"
-	"k8s.io/klog"
+	"k8s.io/klog/v2"
 )
 
 func init() {
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -136,7 +136,7 @@ k8s.io/apimachinery/pkg/util/runtime
 k8s.io/apimachinery/pkg/util/wait
 # k8s.io/klog v1.0.0 => k8s.io/klog v1.0.0
 k8s.io/klog
-# k8s.io/klog/v2 v2.0.0 => k8s.io/klog/v2 v2.0.0
+# k8s.io/klog/v2 v2.2.0 => k8s.io/klog/v2 v2.0.0
 k8s.io/klog/v2
 # k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4 => k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4
 k8s.io/utils/exec

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ require (`
`19`	`19`	`golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e`
`20`	`20`	`google.golang.org/grpc v1.27.0`
`21`	`21`	`k8s.io/apimachinery v0.18.2-beta.0`
`22`		`- k8s.io/klog v1.0.0`
	`22`	`+ k8s.io/klog/v2 v2.2.0`
`23`	`23`	`k8s.io/utils v0.0.0-20200411171748-3d5a2fe318e4`
`24`	`24`	`sigs.k8s.io/yaml v1.2.0`
`25`	`25`	`)`
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 {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ package csicommon`
`19`	`19`	`import (`
`20`	`20`	`"github.com/container-storage-interface/spec/lib/go/csi"`
`21`	`21`	`"golang.org/x/net/context"`
`22`		`- "k8s.io/klog"`
	`22`	`+ "k8s.io/klog/v2"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`type DefaultNodeServer struct {`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ import (`
`24`	`24`	`"time"`
`25`	`25`
`26`	`26`	`"google.golang.org/grpc"`
`27`		`- "k8s.io/klog"`
	`27`	`+ "k8s.io/klog/v2"`
`28`	`28`
`29`	`29`	`"github.com/container-storage-interface/spec/lib/go/csi"`
`30`	`30`	`)`
Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ import (`
`31`	`31`	`smbv1alpha1 "github.com/kubernetes-csi/csi-proxy/client/api/smb/v1alpha1"`
`32`	`32`	`smbclientv1alpha1 "github.com/kubernetes-csi/csi-proxy/client/groups/smb/v1alpha1"`
`33`	`33`
`34`		`- "k8s.io/klog"`
	`34`	`+ "k8s.io/klog/v2"`
`35`	`35`	`utilexec "k8s.io/utils/exec"`
`36`	`36`	`"k8s.io/utils/mount"`
`37`	`37`	`)`