From c668ae6ab6bfcf0fa3124e6b3afbb05da357af08 Mon Sep 17 00:00:00 2001 From: Brian Goff Date: Mon, 26 Sep 2022 17:41:04 +0000 Subject: [PATCH] Bump problematic deps Changes in klog and logr have made automatic bumps from dependabot problematic. We also shouldn't need klogv1 so removed that. Signed-off-by: Brian Goff --- go.mod | 5 ++--- go.sum | 9 +++++---- node/lifecycle_test.go | 2 +- node/main_test.go | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index fc167c93a..bd103dc02 100644 --- a/go.mod +++ b/go.mod @@ -28,8 +28,7 @@ require ( k8s.io/apimachinery v0.19.10 k8s.io/apiserver v0.19.10 k8s.io/client-go v0.19.10 - k8s.io/klog v1.0.0 - k8s.io/klog/v2 v2.2.0 + k8s.io/klog/v2 v2.80.0 k8s.io/utils v0.0.0-20200912215256-4140de9c8800 sigs.k8s.io/controller-runtime v0.7.1 ) @@ -43,7 +42,7 @@ require ( github.com/cespare/xxhash/v2 v2.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/evanphx/json-patch v4.9.0+incompatible // indirect - github.com/go-logr/logr v0.3.0 // indirect + github.com/go-logr/logr v1.2.3 // indirect github.com/go-openapi/jsonpointer v0.19.3 // indirect github.com/go-openapi/jsonreference v0.19.3 // indirect github.com/go-openapi/spec v0.19.3 // indirect diff --git a/go.sum b/go.sum index ae524ce4c..af21a28ae 100644 --- a/go.sum +++ b/go.sum @@ -150,8 +150,10 @@ github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG github.com/go-logfmt/logfmt v0.5.1/go.mod h1:WYhtIu8zTZfxdn5+rREduYbwxfcBr/Vr6KEVveWlfTs= github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= -github.com/go-logr/logr v0.3.0 h1:q4c+kbcR0d5rSurhBR8dIgieOaYpXtsdTYfx22Cu6rs= github.com/go-logr/logr v0.3.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= +github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= +github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/zapr v0.2.0 h1:v6Ji8yBW77pva6NkJKQdHLAJKrIJKRHz0RXwPqCHSR4= github.com/go-logr/zapr v0.2.0/go.mod h1:qhKdvif7YF5GI9NWEpyxTSSBdGmzkNguibrdCNVPunU= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -873,11 +875,10 @@ k8s.io/component-base v0.19.10 h1:asX5d7XlF3j1eq0Zpx/n3lStDEDf7tS+86LEU1AEHGU= k8s.io/component-base v0.19.10/go.mod h1:zI8HZGnByYplvaM9JevUscbVVG4bTGzJmrDR60jffvQ= k8s.io/gengo v0.0.0-20200413195148-3a45101e95ac/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= k8s.io/gengo v0.0.0-20200428234225-8167cfdcfc14/go.mod h1:ezvh/TsK7cY6rbqRK0oQQ8IAqLxYwwyPxAX1Pzy0ii0= -k8s.io/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= -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.80.0 h1:lyJt0TWMPaGoODa8B8bUuxgHS3W/m/bNr2cca3brA/g= +k8s.io/klog/v2 v2.80.0/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6 h1:+WnxoVtG8TMiudHBSEtrVL1egv36TkkJm+bA8AxicmQ= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= k8s.io/utils v0.0.0-20200729134348-d5654de09c73/go.mod h1:jPW/WVKK9YHAvNhRxK0md/EJ228hCsBRufyofKtW8HA= diff --git a/node/lifecycle_test.go b/node/lifecycle_test.go index 00e7e15d2..21c6a2067 100644 --- a/node/lifecycle_test.go +++ b/node/lifecycle_test.go @@ -28,7 +28,7 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" watchutils "k8s.io/client-go/tools/watch" - "k8s.io/klog" + "k8s.io/klog/v2" ) var ( diff --git a/node/main_test.go b/node/main_test.go index 3cd740ad7..bf5603b19 100644 --- a/node/main_test.go +++ b/node/main_test.go @@ -6,14 +6,14 @@ import ( "os" "testing" - klogv1 "k8s.io/klog" + "k8s.io/klog/v2" ) var enableEnvTest = flag.Bool("envtest", false, "Enable envtest based tests") func TestMain(m *testing.M) { flagset := flag.NewFlagSet("klog", flag.PanicOnError) - klogv1.InitFlags(flagset) + klog.InitFlags(flagset) flagset.VisitAll(func(f *flag.Flag) { flag.Var(f.Value, "klog."+f.Name, f.Usage) })