diff --git a/go.mod b/go.mod index 5e79d3b5aa..c26dad9b81 100644 --- a/go.mod +++ b/go.mod @@ -94,7 +94,7 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect k8s.io/component-base v0.23.4 // indirect - k8s.io/klog/v2 v2.50.2 + k8s.io/klog/v2 v2.60.0 k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect ) diff --git a/go.sum b/go.sum index d84f94756a..31196532e2 100644 --- a/go.sum +++ b/go.sum @@ -1521,8 +1521,8 @@ k8s.io/klog/v2 v2.0.0/go.mod h1:PBfzABfn139FHAV07az/IF9Wp1bkk3vpT2XSJ76fSDE= k8s.io/klog/v2 v2.2.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.4.0/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.30.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= -k8s.io/klog/v2 v2.50.2 h1:OsuacU5nfUhtQY1ictYdOEzkUoP5zkZ61i8F67Ch6W0= -k8s.io/klog/v2 v2.50.2/go.mod h1:N3kgBtsFxMb4nQ0eBDgbHEt/dtxBuTkSFQ+7K5OUoz4= +k8s.io/klog/v2 v2.60.0 h1:gpzK92+m2MpVQKeRAUO+GURys568jE2RzMlIKEQeA9Q= +k8s.io/klog/v2 v2.60.0/go.mod h1:N3kgBtsFxMb4nQ0eBDgbHEt/dtxBuTkSFQ+7K5OUoz4= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd/go.mod h1:WOJ3KddDSol4tAGcJo0Tvi+dK12EcqSLqcWsryKMpfM= k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 h1:E3J9oCLlaobFUqsjG9DfKbP2BmgwBL2p7pn0A3dG9W4= diff --git a/vendor/k8s.io/klog/v2/contextual.go b/vendor/k8s.io/klog/v2/contextual.go index bb0380896a..33743ffb8d 100644 --- a/vendor/k8s.io/klog/v2/contextual.go +++ b/vendor/k8s.io/klog/v2/contextual.go @@ -46,10 +46,6 @@ var ( // globalLogger. globalLoggerOptions loggerOptions - // contextualLogger defines whether globalLogger may get called - // directly. - contextualLogger bool - // klogLogger is used as fallback for logging through the normal klog code // when no Logger is set. klogLogger logr.Logger = logr.New(&klogger{}) @@ -137,15 +133,6 @@ type loggerOptions struct { flush func() } -// SetContextualLogger does the same as SetLogger, but in addition the -// logger may also get called directly by code that retrieves it -// with FromContext, TODO or Background. The logger therefore must -// implements its own verbosity checking. -func SetContextualLogger(logger logr.Logger) { - globalLogger = &logger - contextualLogger = true -} - // ClearLogger removes a backing Logger implementation if one was set earlier // with SetLogger. // diff --git a/vendor/modules.txt b/vendor/modules.txt index d9aa66e714..9eb37a1e11 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -887,7 +887,7 @@ k8s.io/component-base/config/v1alpha1 # k8s.io/klog v1.0.0 ## explicit; go 1.12 k8s.io/klog -# k8s.io/klog/v2 v2.50.2 +# k8s.io/klog/v2 v2.60.0 ## explicit; go 1.13 k8s.io/klog/v2 k8s.io/klog/v2/internal/buffer