From 60a02062f1d424c2b0360f7360117fb043aea4bc Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 15 Aug 2024 20:56:23 +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/845 Commit: f879413 Author: Network Service Mesh Bot Date: 2024-08-15 15:55:30 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#845) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/675 Commit: 8fc8a72 Author: Network Service Mesh Bot Date: 2024-08-15 15:51:37 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#675) PR link: https://github.com/networkservicemesh/sdk/pull/1658 Commit: eeb0114 Author: Network Service Mesh Bot Date: 2024-08-15 15:49:07 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/api@main (#1658) PR link: https://github.com/networkservicemesh/api/pull/174 Commit: fdbfcd8 Author: Nikita Skrynnik Date: 2024-08-15 21:15:54 +1100 Message: - Revert changes in strToIPNet func (#174) Signed-off-by: NSMBot --- go.mod | 8 ++++---- go.sum | 16 ++++++++-------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index ae23edbb..eeaba180 100644 --- a/go.mod +++ b/go.mod @@ -12,13 +12,13 @@ require ( github.com/golang/protobuf v1.5.3 github.com/google/uuid v1.3.1 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/api v1.13.4-0.20240814093907-03f6633c2677 + 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.20240814134105-78bedfb4371f + github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426 github.com/networkservicemesh/sdk-k8s v0.0.0-20240814134600-f9f55b43a657 - github.com/networkservicemesh/sdk-kernel v0.0.0-20240814134341-a23cb71779da + github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af - github.com/networkservicemesh/sdk-vpp v0.0.0-20240814134715-c500070a78ed + github.com/networkservicemesh/sdk-vpp v0.0.0-20240815205530-f87941372dfd 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 f4851db7..f028bf76 100644 --- a/go.sum +++ b/go.sum @@ -131,20 +131,20 @@ github.com/mdlayher/netlink v1.0.0/go.mod h1:KxeJAFOFLG6AjpyDkQ/iIhxygIUKD+vcwqc github.com/mdlayher/netlink v1.1.0/go.mod h1:H4WCitaheIsdF9yOYu8CFmCgQthAPIWZmcKp9uZHgmY= github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/mikioh/ipaddr v0.0.0-20190404000644-d465c8ab6721/go.mod h1:Ickgr2WtCLZ2MDGd4Gr0geeCH5HybhRJbonOgQpvSxc= -github.com/networkservicemesh/api v1.13.4-0.20240814093907-03f6633c2677 h1:tG5+0VSj+NUQW2zFseHn0n0nZqskXlQklF/xP/XX9Ec= -github.com/networkservicemesh/api v1.13.4-0.20240814093907-03f6633c2677/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI= +github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e h1:Fs34ZZN+bujq5OQEQUpxm0gYQ3g7uSCkcKcoUt70Be0= +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.20240814134105-78bedfb4371f h1:ntNPiVMUTljkkVDdzoJwJihU5udtbsYqyiYdHLm4/LM= -github.com/networkservicemesh/sdk v0.5.1-0.20240814134105-78bedfb4371f/go.mod h1:Tg63o7jzlUWAnD4DAbgbPb2TIbJ/KAP0/DAgl7rS5xk= +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-k8s v0.0.0-20240814134600-f9f55b43a657 h1:X0kVqTn7VQPVo+wVvGrXo+OpnTC7ZWDKmqQX5q8Vrmg= github.com/networkservicemesh/sdk-k8s v0.0.0-20240814134600-f9f55b43a657/go.mod h1:ZEJ1hRzewm/DPddS7m6I6ht2tzLwOwaZ2cfaLiXlXWg= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240814134341-a23cb71779da h1:HRtMdCX/uPkGdNI1IKxcCV9cuMNXK5ZdbCVpJzk9jBY= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240814134341-a23cb71779da/go.mod h1:OshyujtCIpXdJJAJlkGQCuJYL9q0H9ywMFVNe8+6kNE= +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-sriov v0.0.0-20240814134718-0cf84c4ae6af h1:VUcTY0VUfRsgmHwlzIA1boapj569Y5lSKAD51VIp0nc= github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af/go.mod h1:e64mVG2JVZ1DV9AJR4Jj9Rv0HMdzrNyIy86M7Mu/i7E= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240814134715-c500070a78ed h1:wHDodKJTaw2085ZPgpM65Pe8d+FcGQbytAYA3uburlA= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240814134715-c500070a78ed/go.mod h1:Fx0f0aH5TYwwAW8krOAbUMA200yTnStIczDqXNh4IUE= +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/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 8291ba802d46fb51d6d0e3c985eff0b54d93de31 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 15 Aug 2024 21:00:59 +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 649c30ff..ce7bc36e 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.20240815204907-eeb0114b9426 github.com/networkservicemesh/sdk-k8s v0.0.0-20240815205359-2f6c43d4f381 - github.com/networkservicemesh/sdk-kernel v0.0.0-20240814134341-a23cb71779da + github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af github.com/networkservicemesh/sdk-vpp v0.0.0-20240815205530-f87941372dfd github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 diff --git a/go.sum b/go.sum index 4202c188..0b72dda1 100644 --- a/go.sum +++ b/go.sum @@ -139,8 +139,8 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426 h1:O4v2cZ github.com/networkservicemesh/sdk v0.5.1-0.20240815204907-eeb0114b9426/go.mod h1:D/CFLQOWMeHTYtKF8KgZmBNaNOfzBclWJj3BIPve7Hk= 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-20240814134341-a23cb71779da h1:HRtMdCX/uPkGdNI1IKxcCV9cuMNXK5ZdbCVpJzk9jBY= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240814134341-a23cb71779da/go.mod h1:OshyujtCIpXdJJAJlkGQCuJYL9q0H9ywMFVNe8+6kNE= +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-sriov v0.0.0-20240814134718-0cf84c4ae6af h1:VUcTY0VUfRsgmHwlzIA1boapj569Y5lSKAD51VIp0nc= github.com/networkservicemesh/sdk-sriov v0.0.0-20240814134718-0cf84c4ae6af/go.mod h1:e64mVG2JVZ1DV9AJR4Jj9Rv0HMdzrNyIy86M7Mu/i7E= github.com/networkservicemesh/sdk-vpp v0.0.0-20240815205530-f87941372dfd h1:9QeaiD+s3/0WCD7fifLhODpBQ9I27Jr1FD4gO+vQ5is= From 57f50d0a9292dca653e0f0317551789ebeee3032 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 15 Aug 2024 21:05:06 +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 5079d57a..9ee0d00b 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/networkservicemesh/sdk-k8s v0.0.0-20240815205359-2f6c43d4f381 github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d github.com/networkservicemesh/sdk-sriov v0.0.0-20240815205502-119f4beb87be - github.com/networkservicemesh/sdk-vpp v0.0.0-20240814134715-c500070a78ed + github.com/networkservicemesh/sdk-vpp v0.0.0-20240815205530-f87941372dfd 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 adf24b0d..d65cc834 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d h1:X github.com/networkservicemesh/sdk-kernel v0.0.0-20240815205137-8fc8a722193d/go.mod h1:GQTRVlJsnLyJdOVHTEtgPNgDWnjFAfvClUESbjucJWw= 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-20240814134715-c500070a78ed h1:wHDodKJTaw2085ZPgpM65Pe8d+FcGQbytAYA3uburlA= -github.com/networkservicemesh/sdk-vpp v0.0.0-20240814134715-c500070a78ed/go.mod h1:Fx0f0aH5TYwwAW8krOAbUMA200yTnStIczDqXNh4IUE= +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/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=