alexlebens/external-snapshotter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Switch to klog/v2

Browse Source
This commit is contained in:
xing-yang
2020-11-03 04:00:37 +00:00
parent 5caa4bb520
commit 7efebbedec
8 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/snapshot-validation-webhook/main.go
View File

@@ -20,7 +20,7 @@ import (
"flag" "flag"
webhook "github.com/kubernetes-csi/external-snapshotter/v3/pkg/validation-webhook" webhook "github.com/kubernetes-csi/external-snapshotter/v3/pkg/validation-webhook"
"k8s.io/klog" "k8s.io/klog/v2"
) )
func main() { func main() {

5
go.mod
View File

@@ -19,10 +19,9 @@ require (
google.golang.org/grpc v1.29.0 google.golang.org/grpc v1.29.0
k8s.io/api v0.19.0 k8s.io/api v0.19.0
k8s.io/apimachinery 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/component-base v0.19.0
k8s.io/klog v1.0.0 k8s.io/klog/v2 v2.3.0
k8s.io/klog/v2 v2.2.0
k8s.io/kubernetes v1.19.0 k8s.io/kubernetes v1.19.0
) )

2
go.sum
View File

@@ -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.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE=
k8s.io/klog/v2 v2.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= 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.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-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-controller-manager v0.19.0/go.mod h1:uGZyiHK73NxNEN5EZv/Esm3fbCOzeq4ndttMexVZ1L0=
k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ=

2
pkg/validation-webhook/config.go
View File

@@ -19,7 +19,7 @@ package webhook
import ( import (
"crypto/tls" "crypto/tls"
"k8s.io/klog" "k8s.io/klog/v2"
) )
// Config contains the server (the webhook) cert and key. // Config contains the server (the webhook) cert and key.

2
pkg/validation-webhook/snapshot.go
View File

@@ -24,7 +24,7 @@ import (
"github.com/kubernetes-csi/external-snapshotter/v3/pkg/utils" "github.com/kubernetes-csi/external-snapshotter/v3/pkg/utils"
v1 "k8s.io/api/admission/v1" v1 "k8s.io/api/admission/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog" "k8s.io/klog/v2"
) )
var ( var (

2
pkg/validation-webhook/webhook.go
View File

@@ -29,7 +29,7 @@ import (
v1 "k8s.io/api/admission/v1" v1 "k8s.io/api/admission/v1"
"k8s.io/api/admission/v1beta1" "k8s.io/api/admission/v1beta1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/klog" "k8s.io/klog/v2"
) )
var ( var (

11
vendor/k8s.io/klog/v2/klog.go generated vendored
View File

@@ -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. // Deprecated: Use ErrorS instead.
// See the documentation of V for usage.
func (v Verbose) Error(err error, msg string, args ...interface{}) { func (v Verbose) Error(err error, msg string, args ...interface{}) {
if v.enabled { if v.enabled {
logging.errorS(err, v.logr, msg, args...) 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. // Info logs to the INFO log.
// Arguments are handled in the manner of fmt.Print; a newline is appended if missing. // Arguments are handled in the manner of fmt.Print; a newline is appended if missing.
func Info(args ...interface{}) { func Info(args ...interface{}) {

5
vendor/modules.txt vendored
View File

@@ -322,7 +322,7 @@ k8s.io/apimachinery/pkg/version
k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/pkg/watch
k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/json
k8s.io/apimachinery/third_party/forked/golang/reflect 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 ## explicit
k8s.io/client-go/discovery k8s.io/client-go/discovery
k8s.io/client-go/discovery/fake 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/metrics
k8s.io/component-base/version k8s.io/component-base/version
# k8s.io/klog v1.0.0 # k8s.io/klog v1.0.0
## explicit
k8s.io/klog k8s.io/klog
# k8s.io/klog/v2 v2.2.0 # k8s.io/klog/v2 v2.3.0
## explicit ## explicit
k8s.io/klog/v2 k8s.io/klog/v2
# k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 # k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6