From d8843a3349dfd81e86f8e7807930b2f1066445cb Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 19 Aug 2024 09:37:53 +0000 Subject: [PATCH 1/3] Update go.mod and go.sum to latest version from networkservicemesh/sdk-vpp@main PR link: https://github.com/networkservicemesh/sdk-vpp/pull/846 Commit: 12509d5 Author: Network Service Mesh Bot Date: 2024-08-19 04:37:08 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#846) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/676 Commit: 64ed683 Author: Network Service Mesh Bot Date: 2024-08-19 04:33:21 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#676) PR link: https://github.com/networkservicemesh/sdk/pull/1653 Commit: ae25bb4 Author: Botond Szirtes Date: 2024-08-19 11:30:36 +0200 Message: - Add an option to expose Prometheus metrics via http/s server (#1653) 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 9ee0d00b..06d0bf5a 100644 --- a/go.mod +++ b/go.mod @@ -14,11 +14,11 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba - github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426 + github.com/networkservicemesh/sdk v0.5.1-0.20240819093036-ae25bb43f39a github.com/networkservicemesh/sdk-k8s v0.0.0-20240815205359-2f6c43d4f381 - github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d + github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91 github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be - github.com/networkservicemesh/sdk-vpp v0.0.0-20240815205530-f87941372dfd + github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 github.com/safchain/ethtool v0.3.0 diff --git a/go.sum b/go.sum index d65cc834..3e1132b6 100644 --- a/go.sum +++ b/go.sum @@ -135,16 +135,16 @@ github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e h1:Fs34Z github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI= github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba h1:7B6X6N7rwJNpnfsUlBavxuZdYqTx8nAKwxVS/AkuX1o= github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba/go.mod h1:CwikXQ3p/y3j6+HbQQWXKv0f4LPyUd2vKTiViG93qWA= -github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426 h1:O4v2cZ78hnnUmDMsQVNfAZuRnHd5ms2cJ3psCWTI65Q= -github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426/go.mod h1:D/CFLQOWMeHTYtKF8KgZmBNaNOfzBclWJj3BIPve7Hk= +github.com/networkservicemesh/sdk v0.5.1-0.20240819093036-ae25bb43f39a h1:yGa3JaE4yLKzKTefxu/5sT7ESFmIxj2Ai0VnxvQ69co= +github.com/networkservicemesh/sdk v0.5.1-0.20240819093036-ae25bb43f39a/go.mod h1:nz2VJ3l/UDvsEusdIZf7OMxC7zLrRCV1PuziPjxJeVE= github.com/networkservicemesh/sdk-k8s v0.0.0-20240815205359-2f6c43d4f381 h1:sr/MDtfwEJhjZ7BCWov9RKRE21hlsYI4MRw2Xdw7dOQ= github.com/networkservicemesh/sdk-k8s v0.0.0-20240815205359-2f6c43d4f381/go.mod h1:uAVWHLnJh/By4osotqPSiIZVSr51Ou4ramwBVtg9mh0= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d h1:XN2hpFJSaKx+nsVUIA7+a0JTWtb1kqe+Oq98bnfjFMA= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d/go.mod h1:GQTRVlJsnLyJdOVHTEtgPNgDWnjFAfvClUESbjucJWw= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91 h1:seMpnNEml+jwSVL8gYoRLxv3Jkw3lZMtxo37S9gBnoI= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91/go.mod h1:eCKvsQyvharf35MLlqaQ9PF8AtTjgdFpsoprVye7zb0= github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be h1:kdIYTeHmKOhYTZKbPovxgqkvicKEqmsRXec/HVVbnLk= github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be/go.mod h1:Aa7XbMZ31Rtw1wrr93tw99130HA1KCf4YV0EU2g+OKE= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240815205530-f87941372dfd h1:9QeaiD+s3/0WCD7fifLhODpBQ9I27Jr1FD4gO+vQ5is= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240815205530-f87941372dfd/go.mod h1:kBfSc/R4hen5kt/psIIlhXmn53bo5ayXyqJkn9oFjtA= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b h1:29EvRX9L5ijP9qyJRJXJGpiFMZS7Kc+SxZERp4lJ7w0= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b/go.mod h1:dzzJ0EPV3+tOZyJuzRMGBxK0BNezStxml+AfmLD7npA= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6/go.mod h1:n6+8PnoDvWj6WMryfU3J8HOCusgysFjQ0kGLfrcsDEM= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8= From 8e52c988c182990cbc229fbce25152cf3e6fca91 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 19 Aug 2024 09:42:50 +0000 Subject: [PATCH 2/3] Automatically resolving conflicts in go.mod and updating dependency versions to the latest Signed-off-by: NSMBot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 84f5d805..549a55fa 100644 --- a/go.mod +++ b/go.mod @@ -16,7 +16,7 @@ require ( github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba github.com/networkservicemesh/sdk v0.5.1-0.20240819093036-ae25bb43f39a github.com/networkservicemesh/sdk-k8s v0.0.0-20240819093526-ad1418da797a - github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d + github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91 github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 diff --git a/go.sum b/go.sum index 3be02286..deadba14 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240819093036-ae25bb43f39a h1:yGa3Ja github.com/networkservicemesh/sdk v0.5.1-0.20240819093036-ae25bb43f39a/go.mod h1:nz2VJ3l/UDvsEusdIZf7OMxC7zLrRCV1PuziPjxJeVE= github.com/networkservicemesh/sdk-k8s v0.0.0-20240819093526-ad1418da797a h1:bhpkqGkkRjO36IGTmA7TRuLvMPgjAw/4KRQCG6XUfqo= github.com/networkservicemesh/sdk-k8s v0.0.0-20240819093526-ad1418da797a/go.mod h1:N6OhPGQHfCN/xRbgyZfzbZ56/t8oZ04GyWlffsFDE9I= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d h1:XN2hpFJSaKx+nsVUIA7+a0JTWtb1kqe+Oq98bnfjFMA= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d/go.mod h1:GQTRVlJsnLyJdOVHTEtgPNgDWnjFAfvClUESbjucJWw= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91 h1:seMpnNEml+jwSVL8gYoRLxv3Jkw3lZMtxo37S9gBnoI= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91/go.mod h1:eCKvsQyvharf35MLlqaQ9PF8AtTjgdFpsoprVye7zb0= github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be h1:kdIYTeHmKOhYTZKbPovxgqkvicKEqmsRXec/HVVbnLk= github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be/go.mod h1:Aa7XbMZ31Rtw1wrr93tw99130HA1KCf4YV0EU2g+OKE= github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b h1:29EvRX9L5ijP9qyJRJXJGpiFMZS7Kc+SxZERp4lJ7w0= From 78cf02f4d351f710bc7d01ea24dc52a90ad55035 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 19 Aug 2024 09:46:52 +0000 Subject: [PATCH 3/3] Automatically resolving conflicts in go.mod and updating dependency versions to the latest Signed-off-by: NSMBot --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 7e39c625..53ea88e1 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/networkservicemesh/sdk-k8s v0.0.0-20240819093526-ad1418da797a github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91 github.com/networkservicemesh/sdk-sriov v0.0.0-20240819093621-8447a4a3f199 - github.com/networkservicemesh/sdk-vpp v0.0.0-20240815205530-f87941372dfd + github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 github.com/safchain/ethtool v0.3.0 diff --git a/go.sum b/go.sum index f4c2de3f..c9d64ee9 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91 h1:s github.com/networkservicemesh/sdk-kernel v0.0.0-20240819093321-64ed6830fe91/go.mod h1:eCKvsQyvharf35MLlqaQ9PF8AtTjgdFpsoprVye7zb0= github.com/networkservicemesh/sdk-sriov v0.0.0-20240819093621-8447a4a3f199 h1:wUo1fWJAZ5RkW0FaZ1DekwOKKCe6zhjJrBcQdGGfUBw= github.com/networkservicemesh/sdk-sriov v0.0.0-20240819093621-8447a4a3f199/go.mod h1:pMxDdhmCcfwQFrtcljU5CmSFyrCMsbAlH6dZjb5BjGU= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240815205530-f87941372dfd h1:9QeaiD+s3/0WCD7fifLhODpBQ9I27Jr1FD4gO+vQ5is= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240815205530-f87941372dfd/go.mod h1:kBfSc/R4hen5kt/psIIlhXmn53bo5ayXyqJkn9oFjtA= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b h1:29EvRX9L5ijP9qyJRJXJGpiFMZS7Kc+SxZERp4lJ7w0= +github.com/networkservicemesh/sdk-vpp v0.0.0-20240819093708-12509d5c341b/go.mod h1:dzzJ0EPV3+tOZyJuzRMGBxK0BNezStxml+AfmLD7npA= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6/go.mod h1:n6+8PnoDvWj6WMryfU3J8HOCusgysFjQ0kGLfrcsDEM= github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=