From 1b369843bc57eea5b280fb0c3286874250dda5d2 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Fri, 3 Jun 2022 15:15:56 +0000 Subject: [PATCH 1/2] Update go.mod and go.sum to latest version from networkservicemesh/sdk-vpp@main PR link: https://github.com/networkservicemesh/sdk-vpp/pull/601 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: f38df88 Author: Network Service Mesh Bot Date: 2022-06-03 10:15:07 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sd… Signed-off-by: NSMBot --- go.mod | 6 +++--- go.sum | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/go.mod b/go.mod index b5616adf..e6264c69 100644 --- a/go.mod +++ b/go.mod @@ -14,10 +14,10 @@ require ( github.com/google/uuid v1.2.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab - github.com/networkservicemesh/sdk v0.5.1-0.20220602004728-9998b77fcb6b + github.com/networkservicemesh/sdk v0.5.1-0.20220602113306-74b8b0ff702e github.com/networkservicemesh/sdk-k8s v0.0.0-20220530212608-9aea487db189 github.com/networkservicemesh/sdk-sriov v0.0.0-20220602005423-575cf9947bc6 - github.com/networkservicemesh/sdk-vpp v0.0.0-20220602005420-20cd53b31893 + github.com/networkservicemesh/sdk-vpp v0.0.0-20220603151507-f38df88434f3 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/spiffe/go-spiffe/v2 v2.0.0 @@ -49,7 +49,7 @@ require ( github.com/hashicorp/errwrap v1.0.0 // indirect github.com/hashicorp/go-multierror v1.1.1 // indirect github.com/lunixbochs/struc v0.0.0-20200521075829-a4cb8d33dbbe // indirect - github.com/networkservicemesh/sdk-kernel v0.0.0-20220602005025-aeb8e5a41690 // indirect + github.com/networkservicemesh/sdk-kernel v0.0.0-20220603151005-aa00631f2e0f // indirect github.com/open-policy-agent/opa v0.16.1 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 // indirect diff --git a/go.sum b/go.sum index a6c6c5b0..b19a2dfd 100644 --- a/go.sum +++ b/go.sum @@ -324,16 +324,16 @@ github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRW github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw= github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab h1:hV6T7Kvze0qQphqi6g5ZKFoJ0m08OKdWETUINo3tuaA= github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v0.5.1-0.20220602004728-9998b77fcb6b h1:wA2KctTtA/pHe8tsDBCVdvWnnSQPj2xL+7eVRSfeWPk= -github.com/networkservicemesh/sdk v0.5.1-0.20220602004728-9998b77fcb6b/go.mod h1:FdmGiefBBcj9HlV+poQSEAPOuBVp/hkwjWoDEN2a+jg= +github.com/networkservicemesh/sdk v0.5.1-0.20220602113306-74b8b0ff702e h1:3LqWbi5IcVy88YNE4X1YeJ97zX9YE5T+8w+Xjb6Z67A= +github.com/networkservicemesh/sdk v0.5.1-0.20220602113306-74b8b0ff702e/go.mod h1:FdmGiefBBcj9HlV+poQSEAPOuBVp/hkwjWoDEN2a+jg= github.com/networkservicemesh/sdk-k8s v0.0.0-20220530212608-9aea487db189 h1:hMmYApGm9skKlXnMXq5GE54JDN3a3aWZJYMdJWRcltc= github.com/networkservicemesh/sdk-k8s v0.0.0-20220530212608-9aea487db189/go.mod h1:wPMD0BREsDwf5x9fnmD5p7XGbl5Jh6bVxanKlGuOVg4= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220602005025-aeb8e5a41690 h1:nMTbmdoKRM185U2TFyPHtSh+G+BT7w2q+owhTDlKBbg= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220602005025-aeb8e5a41690/go.mod h1:PhvNG1KMMYEv6KbiXmc4FQgtkn1dtOIvWW8SF1uTolU= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220603151005-aa00631f2e0f h1:g1FXEvoiLP220l1faA7JDLOaV56Cq1Vz5K7G8DPiSZ8= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220603151005-aa00631f2e0f/go.mod h1:xukX7XZOUQpnLG9df5bckNk3r9Is9kPXTtkUwuWk7qw= github.com/networkservicemesh/sdk-sriov v0.0.0-20220602005423-575cf9947bc6 h1:kMCepMg8gLUC/tgTn3QbZmLmFOjCkcs7sp+wITIkO4A= github.com/networkservicemesh/sdk-sriov v0.0.0-20220602005423-575cf9947bc6/go.mod h1:cm78VFqyYtJST+nJVlJqXFMofL3LQcqtGc1gYiNp/f8= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220602005420-20cd53b31893 h1:jg6BP78jPKK0b25dBns3S60NFGgGFKPkrV36OEHR15M= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220602005420-20cd53b31893/go.mod h1:iWbQWhFTp2kMnSU2iIjQ6Euwu/l5od7DCfHaqzimJf4= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220603151507-f38df88434f3 h1:YnFjPBeoXJZBbLXU+rOpEjLKEbI5UbZRscfcLjqhY60= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220603151507-f38df88434f3/go.mod h1:lF+eq/4v/WseGyJqIGHep8OOgFUfC3jDRP4+IT70uNc= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= From 61688be15f2b9f196b0715515e1e5372105755e9 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Fri, 3 Jun 2022 15:37:57 +0000 Subject: [PATCH 2/2] Automatically resolving conflicts in go.mod and updating dependency versions to the latest Signed-off-by: NSMBot --- go.mod | 2 +- go.sum | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 4a317361..5fde55c0 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/networkservicemesh/sdk v0.5.1-0.20220602113306-74b8b0ff702e github.com/networkservicemesh/sdk-k8s v0.0.0-20220603151217-f79531436eb1 github.com/networkservicemesh/sdk-sriov v0.0.0-20220602005423-575cf9947bc6 - github.com/networkservicemesh/sdk-vpp v0.0.0-20220603151507-f38df88434f3 + github.com/networkservicemesh/sdk-vpp v0.0.0-20220602005420-20cd53b31893 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/spiffe/go-spiffe/v2 v2.0.0 diff --git a/go.sum b/go.sum index acac2ca9..981e467a 100644 --- a/go.sum +++ b/go.sum @@ -328,12 +328,12 @@ github.com/networkservicemesh/sdk v0.5.1-0.20220602113306-74b8b0ff702e h1:3LqWbi github.com/networkservicemesh/sdk v0.5.1-0.20220602113306-74b8b0ff702e/go.mod h1:FdmGiefBBcj9HlV+poQSEAPOuBVp/hkwjWoDEN2a+jg= github.com/networkservicemesh/sdk-k8s v0.0.0-20220603151217-f79531436eb1 h1:ZhahI4ZiCoTUtXUVw4VdsLns7qIe975oHX9UCQIJ0Cg= github.com/networkservicemesh/sdk-k8s v0.0.0-20220603151217-f79531436eb1/go.mod h1:gxSkZDo8gyQZjGtvTQbrDG83pd/dOXTA+Y+6j3Fqh9M= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220602005025-aeb8e5a41690 h1:nMTbmdoKRM185U2TFyPHtSh+G+BT7w2q+owhTDlKBbg= -github.com/networkservicemesh/sdk-kernel v0.0.0-20220602005025-aeb8e5a41690/go.mod h1:PhvNG1KMMYEv6KbiXmc4FQgtkn1dtOIvWW8SF1uTolU= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220603151005-aa00631f2e0f h1:g1FXEvoiLP220l1faA7JDLOaV56Cq1Vz5K7G8DPiSZ8= +github.com/networkservicemesh/sdk-kernel v0.0.0-20220603151005-aa00631f2e0f/go.mod h1:xukX7XZOUQpnLG9df5bckNk3r9Is9kPXTtkUwuWk7qw= github.com/networkservicemesh/sdk-sriov v0.0.0-20220602005423-575cf9947bc6 h1:kMCepMg8gLUC/tgTn3QbZmLmFOjCkcs7sp+wITIkO4A= github.com/networkservicemesh/sdk-sriov v0.0.0-20220602005423-575cf9947bc6/go.mod h1:cm78VFqyYtJST+nJVlJqXFMofL3LQcqtGc1gYiNp/f8= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220603151507-f38df88434f3 h1:YnFjPBeoXJZBbLXU+rOpEjLKEbI5UbZRscfcLjqhY60= -github.com/networkservicemesh/sdk-vpp v0.0.0-20220603151507-f38df88434f3/go.mod h1:lF+eq/4v/WseGyJqIGHep8OOgFUfC3jDRP4+IT70uNc= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220602005420-20cd53b31893 h1:jg6BP78jPKK0b25dBns3S60NFGgGFKPkrV36OEHR15M= +github.com/networkservicemesh/sdk-vpp v0.0.0-20220602005420-20cd53b31893/go.mod h1:iWbQWhFTp2kMnSU2iIjQ6Euwu/l5od7DCfHaqzimJf4= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=