From a4a3442e3322bba08cfdef1c243512d616c2c5fb Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 18 Apr 2024 10:04:47 +0000 Subject: [PATCH 1/2] Update go.mod and go.sum to latest version from networkservicemesh/sdk-sriov@main PR link: https://github.com/networkservicemesh/sdk-sriov/pull/590 Commit: 53b4eee Author: Network Service Mesh Bot Date: 2024-04-18 05:03:45 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#590) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/659 Commit: 2a4c669 Author: Network Service Mesh Bot Date: 2024-04-18 04:56:06 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#659) PR link: https://github.com/networkservicemesh/sdk/pull/1584 Commit: 608b1b5 Author: Lazy Bear Date: 2024-04-18 13:48:31 +0400 Message: - Add dual stack support. (#1584) * Add dual stack support. * Support client multi channel subscription. * Fix unit tests. * Fix vL3 test. --------- Signed-off-by: Vitaliy Guschin 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 141fee05..cfd88f68 100644 --- a/go.mod +++ b/go.mod @@ -14,10 +14,10 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.13.1-0.20240411170402-f357d8c715a2 github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba - github.com/networkservicemesh/sdk v0.5.1-0.20240415093720-3eafbf6156d7 + github.com/networkservicemesh/sdk v0.5.1-0.20240418094831-608b1b518564 github.com/networkservicemesh/sdk-k8s v0.0.0-20240415152538-9ba517edbae2 - github.com/networkservicemesh/sdk-kernel v0.0.0-20240415094224-0146a64a7221 - github.com/networkservicemesh/sdk-sriov v0.0.0-20240415094843-c4bb53f2e668 + github.com/networkservicemesh/sdk-kernel v0.0.0-20240418095606-2a4c66902432 + github.com/networkservicemesh/sdk-sriov v0.0.0-20240418100345-53b4eee751d5 github.com/networkservicemesh/sdk-vpp v0.0.0-20240415094951-4fada82cea31 github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 972e20a4..91f35dcf 100644 --- a/go.sum +++ b/go.sum @@ -135,14 +135,14 @@ github.com/networkservicemesh/api v1.13.1-0.20240411170402-f357d8c715a2 h1:R3qJR github.com/networkservicemesh/api v1.13.1-0.20240411170402-f357d8c715a2/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.20240415093720-3eafbf6156d7 h1:vyVuyTxdxmLkkE9ztPvkUKgPT5/cxZuVXj6FCyYxEHQ= -github.com/networkservicemesh/sdk v0.5.1-0.20240415093720-3eafbf6156d7/go.mod h1:ERwrGiimSHeUGwgwhgYLl7B/vkYgmIwxZmrQJzJ6hcQ= +github.com/networkservicemesh/sdk v0.5.1-0.20240418094831-608b1b518564 h1:QEAVhzA0X7YXUvfzx72F/wanN68FqTHM0lN4Msfvwh0= +github.com/networkservicemesh/sdk v0.5.1-0.20240418094831-608b1b518564/go.mod h1:ERwrGiimSHeUGwgwhgYLl7B/vkYgmIwxZmrQJzJ6hcQ= github.com/networkservicemesh/sdk-k8s v0.0.0-20240415152538-9ba517edbae2 h1:0A07Inu+jjttQc3ASu/YVoBFPGQTUreM5QcSzuY8CS0= github.com/networkservicemesh/sdk-k8s v0.0.0-20240415152538-9ba517edbae2/go.mod h1:iLYM5iTXXEkR7i8Yf7Wso7ur3NLevxd+LBOCfpoFp7A= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240415094224-0146a64a7221 h1:qkEQyJGM4DtZqKZH7JxH2wzHZW8il6NY58izu4eEGes= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240415094224-0146a64a7221/go.mod h1:OVCkbv9cgaroH0h0HJOGGomd/z8Dt8Ay6129CFeQEkM= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240415094843-c4bb53f2e668 h1:M6/V6xUbcEPThzDWvnXk0IzXyOAf8ypfaOPBfrAbYhI= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240415094843-c4bb53f2e668/go.mod h1:nWeOsujfmwztHXnGr/KazBc9MfZ86Fks9CVUGRyK91s= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240418095606-2a4c66902432 h1:cCTF9FNDcsJ6qacwnAFcL+QbmFHMtp3u4R49ebRvTT4= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240418095606-2a4c66902432/go.mod h1:0I6XLdyHngMeIfl+qmT4UMF78lPpxOPAgOG3y1tjM98= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240418100345-53b4eee751d5 h1:4wbJPcfFvElP4fCnlElEMcKlXckUYWqvZHuAB8nkNWc= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240418100345-53b4eee751d5/go.mod h1:FjCG2SNQD0BdTnSg9PcVZmwtOGPh8O1EbTKukNpDUnk= github.com/networkservicemesh/sdk-vpp v0.0.0-20240415094951-4fada82cea31 h1:LYBpgepblw1iWm9z3l51IQoGQSk6isD9hWsDv5DpVWM= github.com/networkservicemesh/sdk-vpp v0.0.0-20240415094951-4fada82cea31/go.mod h1:CETBQdISmLtIlvwQiKgz9vgibCvSwSvceYCwL19ni7Q= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI= From 0bc063d1567887d9d2ec5c63ac1f0d9f75c3c4b0 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Thu, 18 Apr 2024 10:10: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 | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 55e61ee1..ec8dc6a4 100644 --- a/go.mod +++ b/go.mod @@ -16,8 +16,8 @@ require ( github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba github.com/networkservicemesh/sdk v0.5.1-0.20240418094831-608b1b518564 github.com/networkservicemesh/sdk-k8s v0.0.0-20240418095920-671945331706 - github.com/networkservicemesh/sdk-kernel v0.0.0-20240415094224-0146a64a7221 - github.com/networkservicemesh/sdk-sriov v0.0.0-20240415094843-c4bb53f2e668 + github.com/networkservicemesh/sdk-kernel v0.0.0-20240418095606-2a4c66902432 + github.com/networkservicemesh/sdk-sriov v0.0.0-20240418100345-53b4eee751d5 github.com/networkservicemesh/sdk-vpp v0.0.0-20240415094951-4fada82cea31 github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 7352fc78..3fdd71bb 100644 --- a/go.sum +++ b/go.sum @@ -139,10 +139,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20240418094831-608b1b518564 h1:QEAVhz github.com/networkservicemesh/sdk v0.5.1-0.20240418094831-608b1b518564/go.mod h1:ERwrGiimSHeUGwgwhgYLl7B/vkYgmIwxZmrQJzJ6hcQ= github.com/networkservicemesh/sdk-k8s v0.0.0-20240418095920-671945331706 h1:2E+tZ2QKs/1NJCsn7POtDy5sb3ds4zLAyowfty5KPsQ= github.com/networkservicemesh/sdk-k8s v0.0.0-20240418095920-671945331706/go.mod h1:pyMim9f/Y1GSShtz5eI5vLUItYnurbqH/kYd3oMmhxk= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240415094224-0146a64a7221 h1:qkEQyJGM4DtZqKZH7JxH2wzHZW8il6NY58izu4eEGes= -github.com/networkservicemesh/sdk-kernel v0.0.0-20240415094224-0146a64a7221/go.mod h1:OVCkbv9cgaroH0h0HJOGGomd/z8Dt8Ay6129CFeQEkM= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240415094843-c4bb53f2e668 h1:M6/V6xUbcEPThzDWvnXk0IzXyOAf8ypfaOPBfrAbYhI= -github.com/networkservicemesh/sdk-sriov v0.0.0-20240415094843-c4bb53f2e668/go.mod h1:nWeOsujfmwztHXnGr/KazBc9MfZ86Fks9CVUGRyK91s= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240418095606-2a4c66902432 h1:cCTF9FNDcsJ6qacwnAFcL+QbmFHMtp3u4R49ebRvTT4= +github.com/networkservicemesh/sdk-kernel v0.0.0-20240418095606-2a4c66902432/go.mod h1:0I6XLdyHngMeIfl+qmT4UMF78lPpxOPAgOG3y1tjM98= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240418100345-53b4eee751d5 h1:4wbJPcfFvElP4fCnlElEMcKlXckUYWqvZHuAB8nkNWc= +github.com/networkservicemesh/sdk-sriov v0.0.0-20240418100345-53b4eee751d5/go.mod h1:FjCG2SNQD0BdTnSg9PcVZmwtOGPh8O1EbTKukNpDUnk= github.com/networkservicemesh/sdk-vpp v0.0.0-20240415094951-4fada82cea31 h1:LYBpgepblw1iWm9z3l51IQoGQSk6isD9hWsDv5DpVWM= github.com/networkservicemesh/sdk-vpp v0.0.0-20240415094951-4fada82cea31/go.mod h1:CETBQdISmLtIlvwQiKgz9vgibCvSwSvceYCwL19ni7Q= github.com/networkservicemesh/vpphelper v0.0.0-20240115135903-e2b961f768b6 h1:o+enN5yCikNXZN+hO+JjE+aLxBWq9+GMVF9GSQtpwMI=