From ed976eee3c2faa8edb6f7c7cc85340c133cc27bb Mon Sep 17 00:00:00 2001 From: Yiou Zhu Date: Wed, 23 Sep 2020 16:43:26 -0700 Subject: [PATCH] revert klog from v2 to v1 (#33) (#35) (cherry picked from commit 257952b5a79148eebd0234221285eb62f0ec101d) --- go.mod | 2 +- go.sum | 8 +++----- pkg/collector/process.go | 2 +- pkg/collector/tcp.go | 2 +- pkg/collector/udp.go | 2 +- pkg/exporter/process.go | 2 +- pkg/registry/build_registry/build_registry.go | 2 +- pkg/test/exporter_collector_test.go | 2 +- 8 files changed, 10 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index 65e0986e..fe1beb19 100644 --- a/go.mod +++ b/go.mod @@ -5,5 +5,5 @@ go 1.13 require ( github.com/golang/mock v1.4.3 github.com/stretchr/testify v1.5.1 - k8s.io/klog/v2 v2.3.0 + k8s.io/klog v1.0.0 ) diff --git a/go.sum b/go.sum index ec2cbd3a..ff6ce7cd 100644 --- a/go.sum +++ b/go.sum @@ -1,7 +1,6 @@ github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/go-logr/logr v0.2.0 h1:QvGt2nLcHH0WK9orKa+ppBPAxREcH364nPUedEpK0TY= -github.com/go-logr/logr v0.2.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v0.1.0/go.mod h1:ixOQHD9gLJUVQQ2ZOR7zLEifBX6tGkNJF4QyIY7sIas= github.com/golang/mock v1.4.3 h1:GV+pQPG/EUUbkh47niozDcADz6go/dUwhVzdUQHIVRw= github.com/golang/mock v1.4.3/go.mod h1:UOMv5ysSaYNkG+OFQykRIcU/QvvxJf3p21QfJ2Bt3cw= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= @@ -15,13 +14,12 @@ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/tools v0.0.0-20190425150028-36563e24a262 h1:qsl9y/CJx34tuA7QCPNp86JNJe4spst6Ff8MjvPUdPg= golang.org/x/tools v0.0.0-20190425150028-36563e24a262/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -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/klog v1.0.0 h1:Pt+yjF5aB1xDSVbau4VsWe+dQNzA0qv1LlXdC2dF6Q8= +k8s.io/klog v1.0.0/go.mod h1:4Bi6QPql/J/LkTDqv7R/cd3hPo4k2DG6Ptcz060Ez5I= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/pkg/collector/process.go b/pkg/collector/process.go index 75ed70e0..33e09b44 100644 --- a/pkg/collector/process.go +++ b/pkg/collector/process.go @@ -22,7 +22,7 @@ import ( "sync" "time" - "k8s.io/klog/v2" + "k8s.io/klog" "github.com/vmware/go-ipfix/pkg/entities" "github.com/vmware/go-ipfix/pkg/registry" diff --git a/pkg/collector/tcp.go b/pkg/collector/tcp.go index 3b88521e..7931624c 100644 --- a/pkg/collector/tcp.go +++ b/pkg/collector/tcp.go @@ -6,7 +6,7 @@ import ( "net" "sync" - "k8s.io/klog/v2" + "k8s.io/klog" ) func (cp *collectingProcess) startTCPServer() { diff --git a/pkg/collector/udp.go b/pkg/collector/udp.go index dfb3d6f8..44eec2a0 100644 --- a/pkg/collector/udp.go +++ b/pkg/collector/udp.go @@ -20,7 +20,7 @@ import ( "sync" "time" - "k8s.io/klog/v2" + "k8s.io/klog" "github.com/vmware/go-ipfix/pkg/entities" ) diff --git a/pkg/exporter/process.go b/pkg/exporter/process.go index 9bbbae47..cc76ebcf 100644 --- a/pkg/exporter/process.go +++ b/pkg/exporter/process.go @@ -20,7 +20,7 @@ import ( "net" "time" - "k8s.io/klog/v2" + "k8s.io/klog" "github.com/vmware/go-ipfix/pkg/entities" ) diff --git a/pkg/registry/build_registry/build_registry.go b/pkg/registry/build_registry/build_registry.go index 2c720be1..6dc403b5 100644 --- a/pkg/registry/build_registry/build_registry.go +++ b/pkg/registry/build_registry/build_registry.go @@ -28,7 +28,7 @@ import ( "strconv" "strings" - "k8s.io/klog/v2" + "k8s.io/klog" "github.com/vmware/go-ipfix/pkg/entities" "github.com/vmware/go-ipfix/pkg/registry" diff --git a/pkg/test/exporter_collector_test.go b/pkg/test/exporter_collector_test.go index 0ec581cd..c2dd6d08 100644 --- a/pkg/test/exporter_collector_test.go +++ b/pkg/test/exporter_collector_test.go @@ -20,7 +20,7 @@ import ( "time" "github.com/stretchr/testify/assert" - "k8s.io/klog/v2" + "k8s.io/klog" "github.com/vmware/go-ipfix/pkg/collector" "github.com/vmware/go-ipfix/pkg/entities"