From 341454d10d40e662af1721090b634faab5ab6065 Mon Sep 17 00:00:00 2001 From: NSMBot Date: Sat, 14 May 2022 20:07:01 +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/358 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit: 2e09528 Author: Network Service Mesh Bot Date: 2022-05-14 15:04:55 -0500 Message: - Update go.mod and go.sum to latest version from networkservicemesh/sd… 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 5d09df6..ae9da3a 100644 --- a/go.mod +++ b/go.mod @@ -6,9 +6,9 @@ require ( github.com/antonfisher/nested-logrus-formatter v1.3.1 github.com/edwarnicke/grpcfd v1.1.2 github.com/kelseyhightower/envconfig v1.4.0 - github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351 - github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0 - github.com/networkservicemesh/sdk-k8s v0.0.0-20220514195754-3778661445ed + github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce + github.com/networkservicemesh/sdk v0.5.1-0.20220514195906-4ea3f90ef51e + github.com/networkservicemesh/sdk-k8s v0.0.0-20220514200455-2e09528dad3f github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/spiffe/go-spiffe/v2 v2.0.0 diff --git a/go.sum b/go.sum index f9f7582..0c1f0a6 100644 --- a/go.sum +++ b/go.sum @@ -354,12 +354,12 @@ github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d/go.mod h1:BPko4 github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0= -github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351 h1:xkwnRaajnnqFPEbj5FrVVDjSgp+o5tiHqVb8W5cOAfI= -github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= -github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0 h1:7ObtZZ4na7PIkco8XTIiGTgh9FhvDtTqKHTS1epR5HI= -github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s= -github.com/networkservicemesh/sdk-k8s v0.0.0-20220514195754-3778661445ed h1:J7xb3zHH7Ju89uxL7dZKfIGBJr4rKn7sY0jm4w7VRnA= -github.com/networkservicemesh/sdk-k8s v0.0.0-20220514195754-3778661445ed/go.mod h1:EpSNe/+U2xHVti2sQzlHs3JN004Tas/dok/1Mh9+uYc= +github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce h1:kpVCSUnoJoIy35F60F6DBuOWY+FZuVwYf3TlptLZP6k= +github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= +github.com/networkservicemesh/sdk v0.5.1-0.20220514195906-4ea3f90ef51e h1:CDM6JS8uYAlKwcY24gI2JioWe81AmLEZLBEvFwXgS3o= +github.com/networkservicemesh/sdk v0.5.1-0.20220514195906-4ea3f90ef51e/go.mod h1:twQwRxXlr01yriIoyGkKK5Rd1hOI0GMbPn+RnBy+i0s= +github.com/networkservicemesh/sdk-k8s v0.0.0-20220514200455-2e09528dad3f h1:YhZSd3kAUjIjZc5HDzszQOiPrgyr0/HeDqBEqMqS8kg= +github.com/networkservicemesh/sdk-k8s v0.0.0-20220514200455-2e09528dad3f/go.mod h1:N/d2I9qkJkzJAi0X1S3UjZJVTK1/wMDkdV2FZupk1C8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= From 847cd37eb49d002495d72297c2a29996208d27eb Mon Sep 17 00:00:00 2001 From: NSMBot Date: Sat, 14 May 2022 20:07:44 +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 | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index ae9da3a..df4a58d 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce github.com/networkservicemesh/sdk v0.5.1-0.20220514195906-4ea3f90ef51e - github.com/networkservicemesh/sdk-k8s v0.0.0-20220514200455-2e09528dad3f + github.com/networkservicemesh/sdk-k8s v0.0.0-20220514195754-3778661445ed github.com/pkg/errors v0.9.1 github.com/sirupsen/logrus v1.8.1 github.com/spiffe/go-spiffe/v2 v2.0.0 diff --git a/go.sum b/go.sum index 0c1f0a6..2a09bb7 100644 --- a/go.sum +++ b/go.sum @@ -354,12 +354,14 @@ github.com/nats-io/nats.go v1.13.1-0.20220308171302-2f2f6968e98d/go.mod h1:BPko4 github.com/nats-io/nkeys v0.3.0/go.mod h1:gvUNGjVcM2IPr5rCsRsC6Wb3Hr2CQAm08dsxtV6A5y4= github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c= github.com/nats-io/stan.go v0.10.2/go.mod h1:vo2ax8K2IxaR3JtEMLZRFKIdoK/3o1/PKueapB7ezX0= +github.com/networkservicemesh/api v1.3.2-0.20220512020524-c57fd2623351/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce h1:kpVCSUnoJoIy35F60F6DBuOWY+FZuVwYf3TlptLZP6k= github.com/networkservicemesh/api v1.3.2-0.20220514193644-73abc067b2ce/go.mod h1:hOF2844BSstH1311oDMDgqqXS+kdc77htZNPRKl9mf8= +github.com/networkservicemesh/sdk v0.5.1-0.20220512090615-4f565a9784e0/go.mod h1:gOYlqDYMdIMCIAfl257+Jn8KNHKVQDZjRIvYSA6wH9s= github.com/networkservicemesh/sdk v0.5.1-0.20220514195906-4ea3f90ef51e h1:CDM6JS8uYAlKwcY24gI2JioWe81AmLEZLBEvFwXgS3o= github.com/networkservicemesh/sdk v0.5.1-0.20220514195906-4ea3f90ef51e/go.mod h1:twQwRxXlr01yriIoyGkKK5Rd1hOI0GMbPn+RnBy+i0s= -github.com/networkservicemesh/sdk-k8s v0.0.0-20220514200455-2e09528dad3f h1:YhZSd3kAUjIjZc5HDzszQOiPrgyr0/HeDqBEqMqS8kg= -github.com/networkservicemesh/sdk-k8s v0.0.0-20220514200455-2e09528dad3f/go.mod h1:N/d2I9qkJkzJAi0X1S3UjZJVTK1/wMDkdV2FZupk1C8= +github.com/networkservicemesh/sdk-k8s v0.0.0-20220514195754-3778661445ed h1:J7xb3zHH7Ju89uxL7dZKfIGBJr4rKn7sY0jm4w7VRnA= +github.com/networkservicemesh/sdk-k8s v0.0.0-20220514195754-3778661445ed/go.mod h1:EpSNe/+U2xHVti2sQzlHs3JN004Tas/dok/1Mh9+uYc= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=