From ea4f14c72a6b8713537aceb988a6a0c7210b2c7b Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 17 Oct 2024 17:22:21 +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/863 Commit: ecedd0a Author: Network Service Mesh Bot Date: 2024-10-17 12:21:32 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#863) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/691 Commit: 745014a Author: Network Service Mesh Bot Date: 2024-10-17 12:17:46 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#691) PR link: https://github.com/networkservicemesh/sdk/pull/1535 Commit: 21c4d98 Author: dependabot[bot] Date: 2024-10-17 13:15:20 -0400 Message: - Bump github.com/nats-io/nats-server/v2 from 2.8.2 to 2.9.23 (#1535) Bumps [github.com/nats-io/nats-server/v2](https://github.com/nats-io/nats-server) from 2.8.2 to 2.9.23. - [Release notes](https://github.com/nats-io/nats-server/releases) - [Changelog](https://github.com/nats-io/nats-server/blob/main/.goreleaser.yml) - [Commits](https://github.com/nats-io/nats-server/compare/v2.8.2...v2.9.23) --- updated-dependencies: - dependency-name: github.com/nats-io/nats-server/v2 dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: NSMBot --- go.mod | 6 +++--- go.sum | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/go.mod b/go.mod index b912c762..204cd421 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.20241017131018-3d46f1edd72f + github.com/networkservicemesh/sdk v0.5.1-0.20241017171520-21c4d983a8bc github.com/networkservicemesh/sdk-k8s v0.0.0-20241014115918-0aeda96e03d3 - github.com/networkservicemesh/sdk-kernel v0.0.0-20241017131259-f700ba189bbb + github.com/networkservicemesh/sdk-kernel v0.0.0-20241017171746-745014ade231 github.com/networkservicemesh/sdk-sriov v0.0.0-20241017131645-c4ff1c6451b9 - github.com/networkservicemesh/sdk-vpp v0.0.0-20241017131721-e538941b2c80 + github.com/networkservicemesh/sdk-vpp v0.0.0-20241017172132-ecedd0a685d5 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 44c5332d..2ed4b22d 100644 --- a/go.sum +++ b/go.sum @@ -115,7 +115,7 @@ github.com/kelseyhightower/envconfig v1.4.0 h1:Im6hONhd3pLkfDFsbRgu68RDNkGF1r3dv github.com/kelseyhightower/envconfig v1.4.0/go.mod h1:cccZRl6mQpaq41TPp5QxidR+Sa3axMbJDNb//FQX6Gg= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= -github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk= +github.com/klauspost/compress v1.16.7 h1:2mk3MPGNzKyxErAw8YaohYh69+pa4sIQSC0fPGCFR9I= github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo= github.com/kr/pretty v0.3.1 h1:flRD4NNwYAUpkphVc1HcthR4KEIFJ65n8Mw5qdRn3LE= github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= @@ -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.20241017131018-3d46f1edd72f h1:7lu+V9sTZZRO6O706Flr9Bbk57dxFh5zBOpg4l1JI00= -github.com/networkservicemesh/sdk v0.5.1-0.20241017131018-3d46f1edd72f/go.mod h1:nz2VJ3l/UDvsEusdIZf7OMxC7zLrRCV1PuziPjxJeVE= +github.com/networkservicemesh/sdk v0.5.1-0.20241017171520-21c4d983a8bc h1:Aa8e/VcRaIVyx860cfHvALMsgQe9AGJcr8bO7uNG4Lk= +github.com/networkservicemesh/sdk v0.5.1-0.20241017171520-21c4d983a8bc/go.mod h1:O0xb3CPUS1dkd7IbchN/s4esddsEVuRELUtehVVjB8Y= github.com/networkservicemesh/sdk-k8s v0.0.0-20241014115918-0aeda96e03d3 h1:rrxU9rH5QLYYY7qzzq7oJSjPvSqFZZGUq9LZKKgFdRw= github.com/networkservicemesh/sdk-k8s v0.0.0-20241014115918-0aeda96e03d3/go.mod h1:yeXe0zrb+RWbr7WSswUqcLF+To4HYoyvdH23JOVbzLM= -github.com/networkservicemesh/sdk-kernel v0.0.0-20241017131259-f700ba189bbb h1:UyM6retp3Oj3ClbKyECGPc9koB+VU8Mf3W7JZlk7fp8= -github.com/networkservicemesh/sdk-kernel v0.0.0-20241017131259-f700ba189bbb/go.mod h1:OG6VzM7eZArpuQIT2TkubGVZrnh+av9n6iNuNlPqnPk= +github.com/networkservicemesh/sdk-kernel v0.0.0-20241017171746-745014ade231 h1:AhQmvVdTQku1EpTVPi/D6kPk3zpT7k1Fgr769hKCE/Q= +github.com/networkservicemesh/sdk-kernel v0.0.0-20241017171746-745014ade231/go.mod h1:HD9Xye7a0ph/KxBP942aMI544Ap3UpyV8j9XqgfwEKU= github.com/networkservicemesh/sdk-sriov v0.0.0-20241017131645-c4ff1c6451b9 h1:8a4YTJV7XlyYIbN746qknFDwkZfyIbaPkhX2pmmffQo= github.com/networkservicemesh/sdk-sriov v0.0.0-20241017131645-c4ff1c6451b9/go.mod h1:LS6M+Pz2JoqXhptC/FaE+fu6bxF9nuEqn7m6BAAvzWk= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241017131721-e538941b2c80 h1:Wvy1XZQ1hhU0qb2rt8M0tPn6w22lyqN8fYcbCZLj06g= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241017131721-e538941b2c80/go.mod h1:4OnWdqJpvaSYQJY3vUCRWgLpqm2YiKZU1K0O6Y49Fw4= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241017172132-ecedd0a685d5 h1:gDqBAfOsZscLoOuKu3X4LnObr+gJmCuV8MPdZYsEgKk= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241017172132-ecedd0a685d5/go.mod h1:FXbKj/hWShsA87u8fRCSadqImTJEQ5l10vnmsCTctUU= 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 a07cfe2ca6885f8599717a644e00b2f76ec7b65c Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 17 Oct 2024 17:26:34 +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 | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index c9b7d8cc..f25a25c2 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/networkservicemesh/sdk-k8s v0.0.0-20241014115918-0aeda96e03d3 github.com/networkservicemesh/sdk-kernel v0.0.0-20241017171746-745014ade231 github.com/networkservicemesh/sdk-sriov v0.0.0-20241017172056-3a8c515dbfac - github.com/networkservicemesh/sdk-vpp v0.0.0-20241017131721-e538941b2c80 + github.com/networkservicemesh/sdk-vpp v0.0.0-20241017172132-ecedd0a685d5 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 2b519cdc..894e8a1a 100644 --- a/go.sum +++ b/go.sum @@ -143,8 +143,8 @@ github.com/networkservicemesh/sdk-kernel v0.0.0-20241017171746-745014ade231 h1:A github.com/networkservicemesh/sdk-kernel v0.0.0-20241017171746-745014ade231/go.mod h1:HD9Xye7a0ph/KxBP942aMI544Ap3UpyV8j9XqgfwEKU= github.com/networkservicemesh/sdk-sriov v0.0.0-20241017172056-3a8c515dbfac h1:P4Hu49EEIz7xL/I31mLEPmZWnRQiVui4X7Lx9D+XBfY= github.com/networkservicemesh/sdk-sriov v0.0.0-20241017172056-3a8c515dbfac/go.mod h1:mInoT7/WRFN5nMsdow4JMOiccYgrWEuvA73k1tNUfcw= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241017131721-e538941b2c80 h1:Wvy1XZQ1hhU0qb2rt8M0tPn6w22lyqN8fYcbCZLj06g= -github.com/networkservicemesh/sdk-vpp v0.0.0-20241017131721-e538941b2c80/go.mod h1:4OnWdqJpvaSYQJY3vUCRWgLpqm2YiKZU1K0O6Y49Fw4= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241017172132-ecedd0a685d5 h1:gDqBAfOsZscLoOuKu3X4LnObr+gJmCuV8MPdZYsEgKk= +github.com/networkservicemesh/sdk-vpp v0.0.0-20241017172132-ecedd0a685d5/go.mod h1:FXbKj/hWShsA87u8fRCSadqImTJEQ5l10vnmsCTctUU= 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=