From 7efebbedecc17d40114b9dc575071f3e64031435 Mon Sep 17 00:00:00 2001 From: xing-yang Date: Tue, 3 Nov 2020 04:00:37 +0000 Subject: [PATCH] Switch to klog/v2 --- cmd/snapshot-validation-webhook/main.go | 2 +- go.mod | 5 ++--- go.sum | 2 ++ pkg/validation-webhook/config.go | 2 +- pkg/validation-webhook/snapshot.go | 2 +- pkg/validation-webhook/webhook.go | 2 +- vendor/k8s.io/klog/v2/klog.go | 11 +++++++++-- vendor/modules.txt | 5 ++--- 8 files changed, 19 insertions(+), 12 deletions(-) diff --git a/cmd/snapshot-validation-webhook/main.go b/cmd/snapshot-validation-webhook/main.go index 8d152ec0..a38d0f7c 100644 --- a/cmd/snapshot-validation-webhook/main.go +++ b/cmd/snapshot-validation-webhook/main.go @@ -20,7 +20,7 @@ import ( "flag" webhook "github.com/kubernetes-csi/external-snapshotter/v3/pkg/validation-webhook" - "k8s.io/klog" + "k8s.io/klog/v2" ) func main() { diff --git a/go.mod b/go.mod index 09de7e58..c807af6a 100644 --- a/go.mod +++ b/go.mod @@ -19,10 +19,9 @@ require ( google.golang.org/grpc v1.29.0 k8s.io/api v0.19.0 k8s.io/apimachinery v0.19.0 - k8s.io/client-go v0.19.0 + k8s.io/client-go v0.19.1 k8s.io/component-base v0.19.0 - k8s.io/klog v1.0.0 - k8s.io/klog/v2 v2.2.0 + k8s.io/klog/v2 v2.3.0 k8s.io/kubernetes v1.19.0 ) diff --git a/go.sum b/go.sum index 51c56332..61907c86 100644 --- a/go.sum +++ b/go.sum @@ -789,6 +789,8 @@ 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= +k8s.io/klog/v2 v2.3.0 h1:WmkrnW7fdrm0/DMClc+HIxtftvxVIPAhlVwMQo5yLco= +k8s.io/klog/v2 v2.3.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/kube-aggregator v0.19.0/go.mod h1:1Ln45PQggFAG8xOqWPIYMxUq8WNtpPnYsbUJ39DpF/A= k8s.io/kube-controller-manager v0.19.0/go.mod h1:uGZyiHK73NxNEN5EZv/Esm3fbCOzeq4ndttMexVZ1L0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ= diff --git a/pkg/validation-webhook/config.go b/pkg/validation-webhook/config.go index e67320b6..59add5b2 100644 --- a/pkg/validation-webhook/config.go +++ b/pkg/validation-webhook/config.go @@ -19,7 +19,7 @@ package webhook import ( "crypto/tls" - "k8s.io/klog" + "k8s.io/klog/v2" ) // Config contains the server (the webhook) cert and key. diff --git a/pkg/validation-webhook/snapshot.go b/pkg/validation-webhook/snapshot.go index 36e54e1f..4fce49ae 100644 --- a/pkg/validation-webhook/snapshot.go +++ b/pkg/validation-webhook/snapshot.go @@ -24,7 +24,7 @@ import ( "github.com/kubernetes-csi/external-snapshotter/v3/pkg/utils" v1 "k8s.io/api/admission/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" - "k8s.io/klog" + "k8s.io/klog/v2" ) var ( diff --git a/pkg/validation-webhook/webhook.go b/pkg/validation-webhook/webhook.go index 1e2b7d11..6a568f8a 100644 --- a/pkg/validation-webhook/webhook.go +++ b/pkg/validation-webhook/webhook.go @@ -29,7 +29,7 @@ import ( v1 "k8s.io/api/admission/v1" "k8s.io/api/admission/v1beta1" "k8s.io/apimachinery/pkg/runtime" - "k8s.io/klog" + "k8s.io/klog/v2" ) var ( diff --git a/vendor/k8s.io/klog/v2/klog.go b/vendor/k8s.io/klog/v2/klog.go index ae2b8613..49f1f2dd 100644 --- a/vendor/k8s.io/klog/v2/klog.go +++ b/vendor/k8s.io/klog/v2/klog.go @@ -1324,14 +1324,21 @@ func (v Verbose) InfoS(msg string, keysAndValues ...interface{}) { } } -// Error is equivalent to the global Error function, guarded by the value of v. -// See the documentation of V for usage. +// Deprecated: Use ErrorS instead. func (v Verbose) Error(err error, msg string, args ...interface{}) { if v.enabled { logging.errorS(err, v.logr, msg, args...) } } +// ErrorS is equivalent to the global Error function, guarded by the value of v. +// See the documentation of V for usage. +func (v Verbose) ErrorS(err error, msg string, keysAndValues ...interface{}) { + if v.enabled { + logging.errorS(err, v.logr, msg, keysAndValues...) + } +} + // Info logs to the INFO log. // Arguments are handled in the manner of fmt.Print; a newline is appended if missing. func Info(args ...interface{}) { diff --git a/vendor/modules.txt b/vendor/modules.txt index 0a7474f8..91f29f18 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -322,7 +322,7 @@ k8s.io/apimachinery/pkg/version k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect -# k8s.io/client-go v0.19.0 => k8s.io/client-go v0.19.0 +# k8s.io/client-go v0.19.1 => k8s.io/client-go v0.19.0 ## explicit k8s.io/client-go/discovery k8s.io/client-go/discovery/fake @@ -539,9 +539,8 @@ k8s.io/client-go/util/workqueue k8s.io/component-base/metrics k8s.io/component-base/version # k8s.io/klog v1.0.0 -## explicit k8s.io/klog -# k8s.io/klog/v2 v2.2.0 +# k8s.io/klog/v2 v2.3.0 ## explicit k8s.io/klog/v2 # k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6