From 886a232e34307285188a6e98cd3e66e83f610dac Mon Sep 17 00:00:00 2001 From: NSMBot Date: Tue, 28 Feb 2023 15:54:19 +0000 Subject: [PATCH 1/2] Update go.mod and go.sum to latest version from networkservicemesh/sdk-k8s@main PR link: https://github.com/networkservicemesh/sdk-k8s/pull/429 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: de8f567 Author: Network Service Mesh Bot Date: 2023-02-28 09:53:25 -0600 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sd… 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 bbb7c7dd..009f9f3b 100644 --- a/go.mod +++ b/go.mod @@ -9,8 +9,8 @@ require ( github.com/edwarnicke/grpcfd v1.1.2 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1 - github.com/networkservicemesh/sdk v0.5.1-0.20230227075049-9a7d5a4b2da3 - github.com/networkservicemesh/sdk-k8s v0.0.0-20230227075730-0e550769c9f4 + github.com/networkservicemesh/sdk v0.5.1-0.20230228154522-f734da775425 + github.com/networkservicemesh/sdk-k8s v0.0.0-20230228155325-de8f56707cac github.com/networkservicemesh/sdk-sriov v0.0.0-20230221161112-5862b1430f27 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 diff --git a/go.sum b/go.sum index 40da041b..1de6a88d 100644 --- a/go.sum +++ b/go.sum @@ -200,10 +200,10 @@ github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182aff github.com/miekg/dns v1.1.50 h1:DQUfb9uc6smULcREF09Uc+/Gd46YWqJd5DbpPE9xkcA= github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1 h1:RxNKksXsXsnDsEo+Cfn43pdPfML024ad//QcdKfgXK4= github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v0.5.1-0.20230227075049-9a7d5a4b2da3 h1:FhEw4Ua6jcjysbpKo7GoZYIjVhahvv0rh/GS8rgvdQo= -github.com/networkservicemesh/sdk v0.5.1-0.20230227075049-9a7d5a4b2da3/go.mod h1:4w0ue1+jI3lHNdSr+rzSpFIBwoGfM5vRcjVkNKZNRxk= -github.com/networkservicemesh/sdk-k8s v0.0.0-20230227075730-0e550769c9f4 h1:WQ1GM2ZRrpoehYu6ds/aRSnnmO8Q4vMlocdk6ZcCniw= -github.com/networkservicemesh/sdk-k8s v0.0.0-20230227075730-0e550769c9f4/go.mod h1:6lqCtQUeOs5S3DTWHIbvnbjVuvSN94GPxkEVGr1mVl4= +github.com/networkservicemesh/sdk v0.5.1-0.20230228154522-f734da775425 h1:fLIPnZECRosfIIGU6F3AMJzB0Uofp+ylW6DdC3Tisfc= +github.com/networkservicemesh/sdk v0.5.1-0.20230228154522-f734da775425/go.mod h1:4w0ue1+jI3lHNdSr+rzSpFIBwoGfM5vRcjVkNKZNRxk= +github.com/networkservicemesh/sdk-k8s v0.0.0-20230228155325-de8f56707cac h1:NprhVYcon+eh4B7RtBC0CYUGc9oGXtdYz5ChOLwG0AY= +github.com/networkservicemesh/sdk-k8s v0.0.0-20230228155325-de8f56707cac/go.mod h1:0aGR/PgSG5rb5Avh0F+Nq1U7FNU4FW6Hm+SaHQnFP1Y= github.com/networkservicemesh/sdk-kernel v0.0.0-20230221133432-0e73f4d59e95 h1:tlkZ+4o2DUog+mCROehlSJV7ODC6wK9briVSXX6WZ+c= github.com/networkservicemesh/sdk-kernel v0.0.0-20230221133432-0e73f4d59e95/go.mod h1:SSrVGXRq+xi57RO2gIieN0rbUhiFtBK/6RCnc/FoFeY= github.com/networkservicemesh/sdk-sriov v0.0.0-20230221161112-5862b1430f27 h1:b3RxmrCM1nfhGkvR7w2vXA2KC0nfLdOf/XzmUF8lrJE= From 7fb8cde8d56da729f18f97ea8ef36d28d21a51ae Mon Sep 17 00:00:00 2001 From: NSMBot Date: Tue, 28 Feb 2023 15:58:57 +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 36548776..dc8d687c 100644 --- a/go.mod +++ b/go.mod @@ -10,7 +10,7 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1 github.com/networkservicemesh/sdk v0.5.1-0.20230228154522-f734da775425 - github.com/networkservicemesh/sdk-k8s v0.0.0-20230227075730-0e550769c9f4 + github.com/networkservicemesh/sdk-k8s v0.0.0-20230228155325-de8f56707cac github.com/networkservicemesh/sdk-sriov v0.0.0-20230228155259-da5f2ef417b6 github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.9.0 diff --git a/go.sum b/go.sum index cdbe6fff..3114360f 100644 --- a/go.sum +++ b/go.sum @@ -202,8 +202,8 @@ github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1 h1:RxNKks github.com/networkservicemesh/api v1.7.2-0.20230123083145-4a6c3ec589e1/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= github.com/networkservicemesh/sdk v0.5.1-0.20230228154522-f734da775425 h1:fLIPnZECRosfIIGU6F3AMJzB0Uofp+ylW6DdC3Tisfc= github.com/networkservicemesh/sdk v0.5.1-0.20230228154522-f734da775425/go.mod h1:4w0ue1+jI3lHNdSr+rzSpFIBwoGfM5vRcjVkNKZNRxk= -github.com/networkservicemesh/sdk-k8s v0.0.0-20230227075730-0e550769c9f4 h1:WQ1GM2ZRrpoehYu6ds/aRSnnmO8Q4vMlocdk6ZcCniw= -github.com/networkservicemesh/sdk-k8s v0.0.0-20230227075730-0e550769c9f4/go.mod h1:6lqCtQUeOs5S3DTWHIbvnbjVuvSN94GPxkEVGr1mVl4= +github.com/networkservicemesh/sdk-k8s v0.0.0-20230228155325-de8f56707cac h1:NprhVYcon+eh4B7RtBC0CYUGc9oGXtdYz5ChOLwG0AY= +github.com/networkservicemesh/sdk-k8s v0.0.0-20230228155325-de8f56707cac/go.mod h1:0aGR/PgSG5rb5Avh0F+Nq1U7FNU4FW6Hm+SaHQnFP1Y= github.com/networkservicemesh/sdk-kernel v0.0.0-20230228154801-38866f9a4f58 h1:01CueT7nPYgSO7/u7Fk+dtAydZnGYTAFVj5bQPkyTgo= github.com/networkservicemesh/sdk-kernel v0.0.0-20230228154801-38866f9a4f58/go.mod h1:mGaLrXPQLE6jG0Yl5+h7DqyD+0Uue05gjpryE2Rh2v8= github.com/networkservicemesh/sdk-sriov v0.0.0-20230228155259-da5f2ef417b6 h1:O2kU/A/FdAHzIrIXwsy4fE1u1sGMvrZQpmvfUBWxduY=