From d4ec669ff809efd4e66d6167f0dc0f4a17cdf11e Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 23 May 2022 15:01:13 +0000 Subject: [PATCH 1/3] Update go.mod and go.sum to latest version from networkservicemesh/sdk-k8s@main PR link: https://github.com/networkservicemesh/sdk-k8s/pull/362 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: 6edbe3b Author: Network Service Mesh Bot Date: 2022-05-23 09:58:23 -0500 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 c3383ca1..810a712d 100644 --- a/go.mod +++ b/go.mod @@ -14,8 +14,8 @@ require ( github.com/google/uuid v1.2.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab - github.com/networkservicemesh/sdk v0.5.1-0.20220523105313-5b89612944b7 - github.com/networkservicemesh/sdk-k8s v0.0.0-20220523110005-9d41b9e1bfd9 + github.com/networkservicemesh/sdk v0.5.1-0.20220523145003-afac72938319 + github.com/networkservicemesh/sdk-k8s v0.0.0-20220523145823-6edbe3b1748a github.com/networkservicemesh/sdk-sriov v0.0.0-20220518181926-0fd4b42d16c0 github.com/networkservicemesh/sdk-vpp v0.0.0-20220519084319-e31621d052f2 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index ff629d16..19f14ec7 100644 --- a/go.sum +++ b/go.sum @@ -382,10 +382,10 @@ github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKue github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab h1:hV6T7Kvze0qQphqi6g5ZKFoJ0m08OKdWETUINo3tuaA= github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= github.com/networkservicemesh/sdk v0.5.1-0.20220518154856-dd9b496ef8a4/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A= -github.com/networkservicemesh/sdk v0.5.1-0.20220523105313-5b89612944b7 h1:oxg2tJ9AWsCgHqoyJZdnGVP5m489z47E/TUSUclRCMk= -github.com/networkservicemesh/sdk v0.5.1-0.20220523105313-5b89612944b7/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A= -github.com/networkservicemesh/sdk-k8s v0.0.0-20220523110005-9d41b9e1bfd9 h1:XeQsZCpIvDl3NSVUgxhaknQzxYyt3QaJsZFxCqE91NU= -github.com/networkservicemesh/sdk-k8s v0.0.0-20220523110005-9d41b9e1bfd9/go.mod h1:R3PDLqBKOQs8ivTHHhvoaWuQ5uc5DNcZB8IchK9K4nU= +github.com/networkservicemesh/sdk v0.5.1-0.20220523145003-afac72938319 h1:5YQM16mYbgsaJ8Qqgpumkvxl8OjBi/yM7a3EWNAqMMI= +github.com/networkservicemesh/sdk v0.5.1-0.20220523145003-afac72938319/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A= +github.com/networkservicemesh/sdk-k8s v0.0.0-20220523145823-6edbe3b1748a h1:KHXSQH2faGQaxoJzlhxj2hKF3SmlaBg/e7yV1YqBQm8= +github.com/networkservicemesh/sdk-k8s v0.0.0-20220523145823-6edbe3b1748a/go.mod h1:d5FNKnR7g+i4AvSNzSpxMx1iRfBS6MmBNr6lLRftQQ0= github.com/networkservicemesh/sdk-kernel v0.0.0-20220518181515-c2a30040c868 h1:c6HLWRjejKf5aZgp1IdkvDx+APIyEf6uO+aEde5Fb2E= github.com/networkservicemesh/sdk-kernel v0.0.0-20220518181515-c2a30040c868/go.mod h1:udwmiGKqtlb4F90RBaNgFKFqxuan7j7XjT84pJDXTAg= github.com/networkservicemesh/sdk-sriov v0.0.0-20220518181926-0fd4b42d16c0 h1:UixyWew+l3cZNESNJrSuecdSOPWn7mvnAVoLbsiZDaM= From 69014cf9f61eb3c6960fafc758ab42c8cb2bb8a7 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 23 May 2022 15:17:13 +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 | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index 20b640ae..2344e63d 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab github.com/networkservicemesh/sdk v0.5.1-0.20220523145003-afac72938319 - github.com/networkservicemesh/sdk-k8s v0.0.0-20220523110005-9d41b9e1bfd9 + github.com/networkservicemesh/sdk-k8s v0.0.0-20220523145823-6edbe3b1748a github.com/networkservicemesh/sdk-sriov v0.0.0-20220518181926-0fd4b42d16c0 github.com/networkservicemesh/sdk-vpp v0.0.0-20220523145856-b10fa9f9fb28 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index d03b5c90..5797a671 100644 --- a/go.sum +++ b/go.sum @@ -382,11 +382,10 @@ github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKue github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab h1:hV6T7Kvze0qQphqi6g5ZKFoJ0m08OKdWETUINo3tuaA= github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= github.com/networkservicemesh/sdk v0.5.1-0.20220518154856-dd9b496ef8a4/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A= -github.com/networkservicemesh/sdk v0.5.1-0.20220523105313-5b89612944b7/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A= github.com/networkservicemesh/sdk v0.5.1-0.20220523145003-afac72938319 h1:5YQM16mYbgsaJ8Qqgpumkvxl8OjBi/yM7a3EWNAqMMI= github.com/networkservicemesh/sdk v0.5.1-0.20220523145003-afac72938319/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A= -github.com/networkservicemesh/sdk-k8s v0.0.0-20220523110005-9d41b9e1bfd9 h1:XeQsZCpIvDl3NSVUgxhaknQzxYyt3QaJsZFxCqE91NU= -github.com/networkservicemesh/sdk-k8s v0.0.0-20220523110005-9d41b9e1bfd9/go.mod h1:R3PDLqBKOQs8ivTHHhvoaWuQ5uc5DNcZB8IchK9K4nU= +github.com/networkservicemesh/sdk-k8s v0.0.0-20220523145823-6edbe3b1748a h1:KHXSQH2faGQaxoJzlhxj2hKF3SmlaBg/e7yV1YqBQm8= +github.com/networkservicemesh/sdk-k8s v0.0.0-20220523145823-6edbe3b1748a/go.mod h1:d5FNKnR7g+i4AvSNzSpxMx1iRfBS6MmBNr6lLRftQQ0= github.com/networkservicemesh/sdk-kernel v0.0.0-20220518181515-c2a30040c868/go.mod h1:udwmiGKqtlb4F90RBaNgFKFqxuan7j7XjT84pJDXTAg= github.com/networkservicemesh/sdk-kernel v0.0.0-20220523145335-892647c1b46d h1:Ni85M+ZcBssdNdSKKrWKh9aC0a8JJkP23D1Ea/vGQpg= github.com/networkservicemesh/sdk-kernel v0.0.0-20220523145335-892647c1b46d/go.mod h1:rJiGCrMyhNpkFZD5VIiSqLk3NqOvDxxi7Mks4Kak3I8= From c939d5269c41824b7d5aabb4f53bc961e74cf541 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Mon, 23 May 2022 15:21:36 +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 | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/go.mod b/go.mod index a024156f..c0b5b5ea 100644 --- a/go.mod +++ b/go.mod @@ -15,7 +15,7 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab github.com/networkservicemesh/sdk v0.5.1-0.20220523145003-afac72938319 - github.com/networkservicemesh/sdk-k8s v0.0.0-20220523110005-9d41b9e1bfd9 + github.com/networkservicemesh/sdk-k8s v0.0.0-20220523145823-6edbe3b1748a github.com/networkservicemesh/sdk-sriov v0.0.0-20220523150012-df065a6f20e3 github.com/networkservicemesh/sdk-vpp v0.0.0-20220523145856-b10fa9f9fb28 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index 7527e299..580e59bb 100644 --- a/go.sum +++ b/go.sum @@ -381,11 +381,10 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0= github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab h1:hV6T7Kvze0qQphqi6g5ZKFoJ0m08OKdWETUINo3tuaA= github.com/networkservicemesh/api v1.3.2-0.20220516230921-edaa6f46d6ab/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v0.5.1-0.20220523105313-5b89612944b7/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A= github.com/networkservicemesh/sdk v0.5.1-0.20220523145003-afac72938319 h1:5YQM16mYbgsaJ8Qqgpumkvxl8OjBi/yM7a3EWNAqMMI= github.com/networkservicemesh/sdk v0.5.1-0.20220523145003-afac72938319/go.mod h1:Wj9RnSFeFBHWlJGOrqgnAg6AWbaQud9XVKxByh5IS/A= -github.com/networkservicemesh/sdk-k8s v0.0.0-20220523110005-9d41b9e1bfd9 h1:XeQsZCpIvDl3NSVUgxhaknQzxYyt3QaJsZFxCqE91NU= -github.com/networkservicemesh/sdk-k8s v0.0.0-20220523110005-9d41b9e1bfd9/go.mod h1:R3PDLqBKOQs8ivTHHhvoaWuQ5uc5DNcZB8IchK9K4nU= +github.com/networkservicemesh/sdk-k8s v0.0.0-20220523145823-6edbe3b1748a h1:KHXSQH2faGQaxoJzlhxj2hKF3SmlaBg/e7yV1YqBQm8= +github.com/networkservicemesh/sdk-k8s v0.0.0-20220523145823-6edbe3b1748a/go.mod h1:d5FNKnR7g+i4AvSNzSpxMx1iRfBS6MmBNr6lLRftQQ0= github.com/networkservicemesh/sdk-kernel v0.0.0-20220523145335-892647c1b46d h1:Ni85M+ZcBssdNdSKKrWKh9aC0a8JJkP23D1Ea/vGQpg= github.com/networkservicemesh/sdk-kernel v0.0.0-20220523145335-892647c1b46d/go.mod h1:rJiGCrMyhNpkFZD5VIiSqLk3NqOvDxxi7Mks4Kak3I8= github.com/networkservicemesh/sdk-sriov v0.0.0-20220523150012-df065a6f20e3 h1:4QwK/jTEJ8MVgEj5ln1eoD6u5t/57V6SQM9EgzIgMg8=