From b9088c4d6d96b27bbfe2fe63bb7bfdaf4e1797cc Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Fri, 18 Jun 2021 08:14:35 -0500 Subject: [PATCH] Fix use of nsc name in connection ignored This is a workaround for: https://github.com/networkservicemesh/deployments-k8s/issues/1826 Signed-off-by: Ed Warnicke --- go.mod | 1 - internal/imports/imports_linux.go | 2 -- main.go | 3 --- 3 files changed, 6 deletions(-) diff --git a/go.mod b/go.mod index 73b3f45..5e4a0c7 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,6 @@ require ( github.com/edwarnicke/debug v1.0.0 github.com/edwarnicke/grpcfd v0.1.0 github.com/edwarnicke/vpphelper v0.0.0-20210225052320-b4f1f1aff45d - github.com/google/uuid v1.1.2 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/api v0.5.1-0.20210618123026-2eb031b7db63 github.com/networkservicemesh/sdk v0.5.1-0.20210618123609-379badf2bfa7 diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go index 2d1a520..7463577 100644 --- a/internal/imports/imports_linux.go +++ b/internal/imports/imports_linux.go @@ -3,12 +3,10 @@ package imports import ( _ "context" - _ "fmt" _ "github.com/antonfisher/nested-logrus-formatter" _ "github.com/edwarnicke/debug" _ "github.com/edwarnicke/grpcfd" _ "github.com/edwarnicke/vpphelper" - _ "github.com/google/uuid" _ "github.com/kelseyhightower/envconfig" _ "github.com/networkservicemesh/api/pkg/api/networkservice" _ "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/connectioncontext" diff --git a/main.go b/main.go index 7c54e33..2229cc5 100644 --- a/main.go +++ b/main.go @@ -20,7 +20,6 @@ package main import ( "context" - "fmt" "net/url" "os" "os/signal" @@ -31,7 +30,6 @@ import ( "github.com/edwarnicke/debug" "github.com/edwarnicke/grpcfd" "github.com/edwarnicke/vpphelper" - "github.com/google/uuid" "github.com/kelseyhightower/envconfig" "github.com/sirupsen/logrus" "github.com/spiffe/go-spiffe/v2/spiffetls/tlsconfig" @@ -193,7 +191,6 @@ func main() { } request := &networkservice.NetworkServiceRequest{ Connection: &networkservice.Connection{ - Id: fmt.Sprintf("%v-%v", config.Name, uuid.New().String()), NetworkService: u.NetworkService(), Labels: u.Labels(), },