diff --git a/cmd/csi-snapshotter/main.go b/cmd/csi-snapshotter/main.go index 23341843..4fa94f92 100644 --- 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 index 3d99892c..cc557c29 100644 --- 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 index 8b46bd78..4e16805f 100644 --- 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 index 9f16ebec..bf18353f 100644 --- 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 index 4e8212f5..d4acf431 100644 --- 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 index d69a613e..a37a8489 100644 --- 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 index 57201c47..c283caf5 100644 --- 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 index dc0bf7d2..9e043141 100644 --- 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 index 36af723e..ff1abf11 100644 --- 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 index 4ad7b9d7..74b28ef8 100644 --- 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 index b50a38bb..20a8cd4d 100644 --- 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 index df1cdcf0..6cdbd8f3 100644 --- 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 (