From 81a8f6a47acd68527fbc855162adf9ebd520ed10 Mon Sep 17 00:00:00 2001 From: Vladimir Popov Date: Fri, 24 Sep 2021 15:11:40 +0700 Subject: [PATCH] Manually update to the latest sdk version (#346) Signed-off-by: Vladimir Popov --- go.mod | 2 +- go.sum | 3 ++- internal/imports/imports_linux.go | 1 - main.go | 5 +---- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index 8a168a3b..439d82bc 100644 --- a/go.mod +++ b/go.mod @@ -13,7 +13,7 @@ require ( github.com/golang/protobuf v1.5.2 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e - github.com/networkservicemesh/sdk v0.5.1-0.20210914140353-07ced33cad48 + github.com/networkservicemesh/sdk v0.5.1-0.20210923121729-a96ead921c0e github.com/networkservicemesh/sdk-k8s v0.0.0-20210901072442-2e531cc7f2be github.com/networkservicemesh/sdk-sriov v0.0.0-20210914141410-e098156e4221 github.com/networkservicemesh/sdk-vpp v0.0.0-20210914141416-15df58636081 diff --git a/go.sum b/go.sum index 9571c368..ba39c655 100644 --- a/go.sum +++ b/go.sum @@ -341,8 +341,9 @@ github.com/networkservicemesh/api v1.0.1-0.20210811070028-10403c0f20c8/go.mod h1 github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e h1:PO6tDo/bGLJqz1qiqCecht/HqMWCKunAds2U9Hvc0yM= github.com/networkservicemesh/api v1.0.1-0.20210907194827-9a36433d7d6e/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU= github.com/networkservicemesh/sdk v0.5.1-0.20210831085601-2e38282f43bc/go.mod h1:t4mwbFHDeOUbmrrFhkcpcyYd5CgkrzmaD7uu8LiLpKs= -github.com/networkservicemesh/sdk v0.5.1-0.20210914140353-07ced33cad48 h1:DHeDBnTrl6821apPSxg4NUciwRkLyF752nPXxEDwySY= github.com/networkservicemesh/sdk v0.5.1-0.20210914140353-07ced33cad48/go.mod h1:eISPu+ySJJ46kg03ZTi/xmpNSU+K4cImwq++ZbDV4F4= +github.com/networkservicemesh/sdk v0.5.1-0.20210923121729-a96ead921c0e h1:TAwBUmxsqAQk4vmNq2RmEe13/OPYZierKXgdC6pFUl8= +github.com/networkservicemesh/sdk v0.5.1-0.20210923121729-a96ead921c0e/go.mod h1:eISPu+ySJJ46kg03ZTi/xmpNSU+K4cImwq++ZbDV4F4= github.com/networkservicemesh/sdk-k8s v0.0.0-20210901072442-2e531cc7f2be h1:lmNiVXFGYcVepsJTRGr1ZixyLFmMezUqNvufglMh3nM= github.com/networkservicemesh/sdk-k8s v0.0.0-20210901072442-2e531cc7f2be/go.mod h1:l+BeER+Sko/KVbnsRQAjbHFTVXUXHgcbxr4C0k6aSdk= github.com/networkservicemesh/sdk-kernel v0.0.0-20210914141039-db5ab40baee1 h1:xfrljIVop5UYgdvFltm6xna5eg9YgUygFuf8MkBIHao= diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go index cdc648d4..c38194a1 100644 --- a/internal/imports/imports_linux.go +++ b/internal/imports/imports_linux.go @@ -72,7 +72,6 @@ import ( _ "github.com/networkservicemesh/sdk/pkg/tools/log" _ "github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger" _ "github.com/networkservicemesh/sdk/pkg/tools/opentracing" - _ "github.com/networkservicemesh/sdk/pkg/tools/resetting" _ "github.com/networkservicemesh/sdk/pkg/tools/spiffejwt" _ "github.com/networkservicemesh/sdk/pkg/tools/spire" _ "github.com/networkservicemesh/sdk/pkg/tools/token" diff --git a/main.go b/main.go index dd44eaf3..b14d42bc 100644 --- a/main.go +++ b/main.go @@ -49,7 +49,6 @@ import ( "github.com/networkservicemesh/sdk/pkg/tools/log" "github.com/networkservicemesh/sdk/pkg/tools/log/logruslogger" "github.com/networkservicemesh/sdk/pkg/tools/opentracing" - "github.com/networkservicemesh/sdk/pkg/tools/resetting" "github.com/networkservicemesh/sdk/pkg/tools/spiffejwt" "github.com/networkservicemesh/sdk/pkg/tools/token" @@ -184,9 +183,7 @@ func main() { cfg.VFIOPath, cfg.CgroupPath, &cfg.ConnectTo, grpc.WithTransportCredentials( - resetting.NewCredentials( - grpcfd.TransportCredentials(credentials.NewTLS(tlsconfig.MTLSClientConfig(source, source, tlsconfig.AuthorizeAny()))), - source.Updated())), + grpcfd.TransportCredentials(credentials.NewTLS(tlsconfig.MTLSClientConfig(source, source, tlsconfig.AuthorizeAny())))), grpc.WithDefaultCallOptions( grpc.WaitForReady(true), grpc.PerRPCCredentials(token.NewPerRPCCredentials(spiffejwt.TokenGeneratorFunc(source, cfg.MaxTokenLifetime))),