From b8235e37f4af6b3b7b4a68582b7ff1cc7b41d3fb Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 14 Feb 2023 16:27:37 +0800 Subject: [PATCH] update go.mod to upgrade some package to newer version Signed-off-by: Ryan --- go.mod | 7 +++---- go.sum | 13 ++++++++++--- tests/e2e/modbus/modbus_suite_test.go | 2 +- tests/e2e/modbus/modbus_test.go | 2 +- tests/e2e/opcua/opcua_suite_test.go | 2 +- tests/e2e/opcua/opcua_test.go | 2 +- tests/e2e/utils/devices.go | 2 +- tests/e2e/utils/logger.go | 2 +- tests/e2e/utils/mapper.go | 2 +- 9 files changed, 20 insertions(+), 14 deletions(-) diff --git a/go.mod b/go.mod index b70760bd..f9411449 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/sailorvii/goav v0.1.4 github.com/sailorvii/modbus v0.1.2 github.com/spf13/cobra v1.2.1 - github.com/spf13/pflag v1.0.5 + github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace github.com/stretchr/testify v1.7.0 github.com/tbrandon/mbserver v0.0.0-20210320091329-a1f8ae952881 github.com/use-go/onvif v0.0.1 @@ -28,7 +28,7 @@ require ( k8s.io/api v0.24.1 k8s.io/apimachinery v0.24.1 k8s.io/klog v1.0.0 - k8s.io/klog/v2 v2.60.1 + k8s.io/klog/v2 v2.80.1 k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 ) @@ -39,7 +39,7 @@ require ( github.com/elgs/gostrgen v0.0.0-20161222160715-9d61ae07eeae // indirect github.com/emicklei/go-restful v2.9.6+incompatible // indirect github.com/fsnotify/fsnotify v1.4.9 // indirect - github.com/go-logr/logr v0.4.0 // indirect + github.com/go-logr/logr v1.2.0 // indirect github.com/go-openapi/jsonpointer v0.19.5 // indirect github.com/go-openapi/jsonreference v0.19.5 // indirect github.com/go-openapi/swag v0.19.14 // indirect @@ -105,7 +105,6 @@ replace ( k8s.io/csi-translation-lib v0.0.0 => k8s.io/csi-translation-lib v0.19.3 k8s.io/gengo v0.0.0 => k8s.io/gengo v0.19.3 k8s.io/heapster => k8s.io/heapster v1.2.0-beta.1 // indirect - k8s.io/klog/v2 => k8s.io/klog/v2 v2.2.0 k8s.io/kube-aggregator v0.0.0 => k8s.io/kube-aggregator v0.19.3 k8s.io/kube-controller-manager v0.0.0 => k8s.io/kube-controller-manager v0.19.3 k8s.io/kube-openapi v0.0.0 => k8s.io/kube-openapi v0.19.3 diff --git a/go.sum b/go.sum index b28b7c1b..ecfb1768 100644 --- a/go.sum +++ b/go.sum @@ -444,8 +444,9 @@ github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= 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.4.0 h1:K7/B1jt6fIBQVd4Owv2MqGQClcgf0R266+7C/QjRcLc= github.com/go-logr/logr v0.4.0/go.mod h1:z6/tIYblkpsD+a4lm/fGIIU9mZ+XfAiaFtq7xTgseGU= +github.com/go-logr/logr v1.2.0 h1:QK40JKJyMdUDz+h+xvCsru/bJhvG0UxvePV0ufL/AcE= +github.com/go-logr/logr v1.2.0/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/zapr v0.4.0/go.mod h1:tabnROwaDl0UNxkVeFRbY8bwB37GwRv0P8lg6aAiEnk= github.com/go-ole/go-ole v1.2.6/go.mod h1:pprOEPIfldk/42T2oK7lQ4v4JSDwmV0As9GaiUsvbm0= github.com/go-openapi/analysis v0.0.0-20180825180245-b006789cd277/go.mod h1:k70tL6pCuVxPJOHXQ+wIac1FUrvNkHolPie/cLEU6hI= @@ -1058,8 +1059,9 @@ github.com/spf13/pflag v0.0.0-20170130214245-9ff6c6923cff/go.mod h1:DYY7MBk1bdzu github.com/spf13/pflag v1.0.1-0.20171106142849-4c012f6dcd95/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.1/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= -github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= +github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace h1:9PNP1jnUjRhfmGMlkXHjYPishpcw4jpSt/V/xYY3FMA= +github.com/spf13/pflag v1.0.6-0.20210604193023-d5e0c0615ace/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE= github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= @@ -1833,8 +1835,13 @@ k8s.io/gengo v0.0.0-20201214224949-b6c5ce23f027/go.mod h1:FiNAH4ZV3gBg2Kwh89tzAE k8s.io/gengo v0.0.0-20210813121822-485abfe95c7c/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.2.0 h1:XRvcwJozkgZ1UQJmfMGpvRthQHOvihEhYtDfAaxMz/A= +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.9.0/go.mod h1:hy9LJ/NvuK+iVyP4Ehqva4HxZG/oXyIS3n3Jmire4Ec= +k8s.io/klog/v2 v2.60.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= +k8s.io/klog/v2 v2.80.1 h1:atnLQ121W371wYYFawwYx1aEY2eUfs4l3J72wtgAwV4= +k8s.io/klog/v2 v2.80.1/go.mod h1:y1WjHnz7Dj687irZUWR/WLkLc5N1YHtjLdmgWjndZn0= k8s.io/kube-aggregator v0.19.3/go.mod h1:5KTkDBxx4YiAYUuqTGmwjH7v54hRdrykqzcPiF8hPJc= k8s.io/kube-controller-manager v0.19.3/go.mod h1:KOwGP13h7FuFVldpunTEjLCAMVbDQODjl0qInCSUMiA= k8s.io/kube-openapi v0.0.0-20200805222855-6aeccd4b50c6/go.mod h1:UuqjUnNftUyPE5H64/qeyjQoUZhGpeFDVdxjTeEVN2o= diff --git a/tests/e2e/modbus/modbus_suite_test.go b/tests/e2e/modbus/modbus_suite_test.go index 60fa0132..366fbf14 100644 --- a/tests/e2e/modbus/modbus_suite_test.go +++ b/tests/e2e/modbus/modbus_suite_test.go @@ -21,7 +21,7 @@ import ( "github.com/kubeedge/mappers-go/tests/e2e/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - log "k8s.io/klog" + log "k8s.io/klog/v2" "testing" ) diff --git a/tests/e2e/modbus/modbus_test.go b/tests/e2e/modbus/modbus_test.go index ddf2d9b9..1a770410 100644 --- a/tests/e2e/modbus/modbus_test.go +++ b/tests/e2e/modbus/modbus_test.go @@ -21,7 +21,7 @@ import ( "github.com/kubeedge/mappers-go/tests/e2e/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - log "k8s.io/klog" + log "k8s.io/klog/v2" "regexp" "strconv" "time" diff --git a/tests/e2e/opcua/opcua_suite_test.go b/tests/e2e/opcua/opcua_suite_test.go index d9e639b3..7b7efe75 100644 --- a/tests/e2e/opcua/opcua_suite_test.go +++ b/tests/e2e/opcua/opcua_suite_test.go @@ -21,7 +21,7 @@ import ( "github.com/kubeedge/mappers-go/tests/e2e/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - log "k8s.io/klog" + log "k8s.io/klog/v2" "testing" ) diff --git a/tests/e2e/opcua/opcua_test.go b/tests/e2e/opcua/opcua_test.go index 916f311a..92fe26fe 100644 --- a/tests/e2e/opcua/opcua_test.go +++ b/tests/e2e/opcua/opcua_test.go @@ -21,7 +21,7 @@ import ( "github.com/kubeedge/mappers-go/tests/e2e/utils" . "github.com/onsi/ginkgo" . "github.com/onsi/gomega" - log "k8s.io/klog" + log "k8s.io/klog/v2" "regexp" "strconv" "time" diff --git a/tests/e2e/utils/devices.go b/tests/e2e/utils/devices.go index 51bc9268..8f51de4c 100644 --- a/tests/e2e/utils/devices.go +++ b/tests/e2e/utils/devices.go @@ -17,7 +17,7 @@ limitations under the License. package utils import ( - log "k8s.io/klog" + log "k8s.io/klog/v2" "os/exec" ) diff --git a/tests/e2e/utils/logger.go b/tests/e2e/utils/logger.go index cecceb95..3815e6b2 100644 --- a/tests/e2e/utils/logger.go +++ b/tests/e2e/utils/logger.go @@ -17,7 +17,7 @@ limitations under the License. package utils import ( - log "k8s.io/klog" + log "k8s.io/klog/v2" "os/exec" "strconv" "strings" diff --git a/tests/e2e/utils/mapper.go b/tests/e2e/utils/mapper.go index d17d7f19..b529d22c 100644 --- a/tests/e2e/utils/mapper.go +++ b/tests/e2e/utils/mapper.go @@ -18,7 +18,7 @@ package utils import ( "fmt" - log "k8s.io/klog" + log "k8s.io/klog/v2" "os/exec" "time" )