From 2155165280704060d3e6b29199af74aeb6cb6516 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Wed, 6 Nov 2024 14:23:04 +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/624 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: 8424c23 Author: Network Service Mesh Bot Date: 2024-11-06 08:22:18 -0600 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk-kernel@main (#624) PR link: https://github.com/networkservicemesh/sdk-kernel/pull/696 Commit: 3e1b97b Author: Network Service Mesh Bot Date: 2024-11-06 08:18:42 -0600 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sdk@main (#696) PR link: https://github.com/networkservicemesh/sdk/pull/1688 Commit: b53ccb0 Author: Szilárd Vincze Date: 2024-11-06 15:16:20 +0100 Message: - Typo fixed in a log. (#1688) 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 6045f7ce..a6b09c57 100644 --- a/go.mod +++ b/go.mod @@ -9,9 +9,9 @@ require ( github.com/edwarnicke/grpcfd v1.1.4 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e - github.com/networkservicemesh/sdk v0.5.1-0.20241105144227-370b7b5f046c + github.com/networkservicemesh/sdk v0.5.1-0.20241106141620-b53ccb0ebe20 github.com/networkservicemesh/sdk-k8s v0.0.0-20241105145807-d2e270ca9224 - github.com/networkservicemesh/sdk-sriov v0.0.0-20241105151147-b31253af687e + github.com/networkservicemesh/sdk-sriov v0.0.0-20241106142218-8424c23a982a github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 github.com/spiffe/go-spiffe/v2 v2.1.7 @@ -44,7 +44,7 @@ require ( github.com/google/uuid v1.3.1 // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect - github.com/networkservicemesh/sdk-kernel v0.0.0-20241105145958-6965743994d5 // indirect + github.com/networkservicemesh/sdk-kernel v0.0.0-20241106141842-3e1b97bc7989 // indirect github.com/open-policy-agent/opa v0.44.0 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/prometheus/client_golang v1.17.0 // indirect diff --git a/go.sum b/go.sum index 2a12ffa4..8decffed 100644 --- a/go.sum +++ b/go.sum @@ -107,14 +107,14 @@ github.com/matttproud/golang_protobuf_extensions v1.0.4/go.mod h1:BSXmuO+STAnVfr github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= 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/sdk v0.5.1-0.20241105144227-370b7b5f046c h1:Qdv1Lqsi3fMgk998INmu8QmaCHw+JKA+3WA55SY32wM= -github.com/networkservicemesh/sdk v0.5.1-0.20241105144227-370b7b5f046c/go.mod h1:lV8RBwf6tHkNFwHLFkzh4Tb/XezMP5IHGx5lW04YjQE= +github.com/networkservicemesh/sdk v0.5.1-0.20241106141620-b53ccb0ebe20 h1:MB62uePZ8UGYTFCJqdiFnLeakQx/m0BPwVp6tJRFWRs= +github.com/networkservicemesh/sdk v0.5.1-0.20241106141620-b53ccb0ebe20/go.mod h1:lV8RBwf6tHkNFwHLFkzh4Tb/XezMP5IHGx5lW04YjQE= github.com/networkservicemesh/sdk-k8s v0.0.0-20241105145807-d2e270ca9224 h1:dSFCwbFKpZJjbDdxCacFxsRTscepjmDUD0kB/BiXa0s= github.com/networkservicemesh/sdk-k8s v0.0.0-20241105145807-d2e270ca9224/go.mod h1:I/+5Lu+imUrGtAuegmaaiiEcQXVitrhO7ntHSMqTMVo= -github.com/networkservicemesh/sdk-kernel v0.0.0-20241105145958-6965743994d5 h1:LjndrfG+oOTGtLkrmz4z29H1Ze5or6tOSVX9yQ9yir8= -github.com/networkservicemesh/sdk-kernel v0.0.0-20241105145958-6965743994d5/go.mod h1:2J8lOoC8wlQPeusiwFTCxxW/HNv74rQ6Igsxhj5j27g= -github.com/networkservicemesh/sdk-sriov v0.0.0-20241105151147-b31253af687e h1:v9KeGHP1idpzn4pd8slPXx2NqjfSOnTYhDZbmLx55Gg= -github.com/networkservicemesh/sdk-sriov v0.0.0-20241105151147-b31253af687e/go.mod h1:RYvsuuThYZWbe/cAi9dKOymCHep+l8jHL+PRVKk0AdQ= +github.com/networkservicemesh/sdk-kernel v0.0.0-20241106141842-3e1b97bc7989 h1:w7B17FnDTGWQUpA1CjUHvSh9xpWroH2WpUlooo3nbLE= +github.com/networkservicemesh/sdk-kernel v0.0.0-20241106141842-3e1b97bc7989/go.mod h1:PIbMseTiQQCOMspQBeT7bM8/lXzQDTB5o4kmwO4qBg8= +github.com/networkservicemesh/sdk-sriov v0.0.0-20241106142218-8424c23a982a h1:khBq2UnVl7+BGE+YWBREevV0vLIQImRznDpdLMVCHQc= +github.com/networkservicemesh/sdk-sriov v0.0.0-20241106142218-8424c23a982a/go.mod h1:RgeW0MBvK+iRaGtnOV604qbzoYxXvsm88UWhWzK6niI= github.com/open-policy-agent/opa v0.44.0 h1:sEZthsrWBqIN+ShTMJ0Hcz6a3GkYsY4FaB2S/ou2hZk= github.com/open-policy-agent/opa v0.44.0/go.mod h1:YpJaFIk5pq89n/k72c1lVvfvR5uopdJft2tMg1CW/yU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= From 8475fc97a4523325718fc170934e63c59398e3b2 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Wed, 6 Nov 2024 14:27:04 +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 6b382fc5..60699e1c 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/networkservicemesh/api v1.13.4-0.20240815101554-fdbfcd84fd0e github.com/networkservicemesh/sdk v0.5.1-0.20241106141620-b53ccb0ebe20 github.com/networkservicemesh/sdk-k8s v0.0.0-20241106142135-62183f1456e5 - github.com/networkservicemesh/sdk-sriov v0.0.0-20241105151147-b31253af687e + github.com/networkservicemesh/sdk-sriov v0.0.0-20241106142218-8424c23a982a github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 github.com/spiffe/go-spiffe/v2 v2.1.7 diff --git a/go.sum b/go.sum index 5fcf293e..8b8be998 100644 --- a/go.sum +++ b/go.sum @@ -111,10 +111,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20241106141620-b53ccb0ebe20 h1:MB62ue github.com/networkservicemesh/sdk v0.5.1-0.20241106141620-b53ccb0ebe20/go.mod h1:lV8RBwf6tHkNFwHLFkzh4Tb/XezMP5IHGx5lW04YjQE= github.com/networkservicemesh/sdk-k8s v0.0.0-20241106142135-62183f1456e5 h1:ZOHpo9z/YFqWw4ImQXG39q9fwmqGXloXGvK2vOj7rBs= github.com/networkservicemesh/sdk-k8s v0.0.0-20241106142135-62183f1456e5/go.mod h1:KiBFMPIj3sHgarT4T06CuVcAGjQawj16k6GDoAxk868= -github.com/networkservicemesh/sdk-kernel v0.0.0-20241105145958-6965743994d5 h1:LjndrfG+oOTGtLkrmz4z29H1Ze5or6tOSVX9yQ9yir8= -github.com/networkservicemesh/sdk-kernel v0.0.0-20241105145958-6965743994d5/go.mod h1:2J8lOoC8wlQPeusiwFTCxxW/HNv74rQ6Igsxhj5j27g= -github.com/networkservicemesh/sdk-sriov v0.0.0-20241105151147-b31253af687e h1:v9KeGHP1idpzn4pd8slPXx2NqjfSOnTYhDZbmLx55Gg= -github.com/networkservicemesh/sdk-sriov v0.0.0-20241105151147-b31253af687e/go.mod h1:RYvsuuThYZWbe/cAi9dKOymCHep+l8jHL+PRVKk0AdQ= +github.com/networkservicemesh/sdk-kernel v0.0.0-20241106141842-3e1b97bc7989 h1:w7B17FnDTGWQUpA1CjUHvSh9xpWroH2WpUlooo3nbLE= +github.com/networkservicemesh/sdk-kernel v0.0.0-20241106141842-3e1b97bc7989/go.mod h1:PIbMseTiQQCOMspQBeT7bM8/lXzQDTB5o4kmwO4qBg8= +github.com/networkservicemesh/sdk-sriov v0.0.0-20241106142218-8424c23a982a h1:khBq2UnVl7+BGE+YWBREevV0vLIQImRznDpdLMVCHQc= +github.com/networkservicemesh/sdk-sriov v0.0.0-20241106142218-8424c23a982a/go.mod h1:RgeW0MBvK+iRaGtnOV604qbzoYxXvsm88UWhWzK6niI= github.com/open-policy-agent/opa v0.44.0 h1:sEZthsrWBqIN+ShTMJ0Hcz6a3GkYsY4FaB2S/ou2hZk= github.com/open-policy-agent/opa v0.44.0/go.mod h1:YpJaFIk5pq89n/k72c1lVvfvR5uopdJft2tMg1CW/yU= github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=