diff --git a/changelogs/unreleased/5396-blackpiglet b/changelogs/unreleased/5396-blackpiglet new file mode 100644 index 000000000..b4808596e --- /dev/null +++ b/changelogs/unreleased/5396-blackpiglet @@ -0,0 +1 @@ +update velero using klog to version v2.9.0 \ No newline at end of file diff --git a/cmd/velero/velero.go b/cmd/velero/velero.go index ece94f161..07be4a884 100644 --- a/cmd/velero/velero.go +++ b/cmd/velero/velero.go @@ -20,7 +20,7 @@ import ( "os" "path/filepath" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/vmware-tanzu/velero/pkg/cmd" "github.com/vmware-tanzu/velero/pkg/cmd/velero" diff --git a/go.mod b/go.mod index 6d3616903..75512d71a 100644 --- a/go.mod +++ b/go.mod @@ -47,7 +47,7 @@ require ( k8s.io/apimachinery v0.22.2 k8s.io/cli-runtime v0.22.2 k8s.io/client-go v0.22.2 - k8s.io/klog v1.0.0 + k8s.io/klog/v2 v2.9.0 k8s.io/kube-aggregator v0.19.12 sigs.k8s.io/controller-runtime v0.10.2 sigs.k8s.io/yaml v1.3.0 @@ -139,7 +139,6 @@ require ( gopkg.in/yaml.v2 v2.4.0 // indirect gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect k8s.io/component-base v0.22.2 // indirect - k8s.io/klog/v2 v2.9.0 // indirect k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect diff --git a/go.sum b/go.sum index 8fa8ba195..75dc52473 100644 --- a/go.sum +++ b/go.sum @@ -1486,8 +1486,6 @@ k8s.io/component-base v0.22.2/go.mod h1:5Br2QhI9OTe79p+TzPe9JKNQYvEKbq9rTJDWllun 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/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAEV2be7d5xI0vBa/VySYy3E= -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/go.mod h1:Od+F08eJP+W3HUb4pSrPpgp9DGU4GzlpG/TmITuYh/Y= k8s.io/klog/v2 v2.9.0 h1:D7HV+n1V57XeZ0m6tdRkfknthUaM06VFbWldOFh8kzM= diff --git a/pkg/cmd/velero/velero.go b/pkg/cmd/velero/velero.go index 8775f69cd..fe712adc0 100644 --- a/pkg/cmd/velero/velero.go +++ b/pkg/cmd/velero/velero.go @@ -23,7 +23,7 @@ import ( "github.com/fatih/color" "github.com/spf13/cobra" - "k8s.io/klog" + "k8s.io/klog/v2" "github.com/vmware-tanzu/velero/pkg/cmd/cli/debug" diff --git a/pkg/controller/suite_test.go b/pkg/controller/suite_test.go index b5c5b4d08..89e6159a1 100644 --- a/pkg/controller/suite_test.go +++ b/pkg/controller/suite_test.go @@ -28,7 +28,7 @@ import ( "github.com/vmware-tanzu/velero/pkg/persistence" persistencemocks "github.com/vmware-tanzu/velero/pkg/persistence/mocks" - "k8s.io/klog" + "k8s.io/klog/v2" "sigs.k8s.io/controller-runtime/pkg/envtest" "sigs.k8s.io/controller-runtime/pkg/manager"