From 6ecb24801399c1e18a4a7718b4d69b087ca59a43 Mon Sep 17 00:00:00 2001 From: Denis Tingaikin Date: Sun, 6 Jun 2021 20:37:15 +0700 Subject: [PATCH 1/2] fix clientOptions Signed-off-by: Denis Tingaikin --- go.mod | 1 + main.go | 16 ++++++++++++++-- pkg/internal/imports/imports_linux.go | 1 + 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/go.mod b/go.mod index 9fd6dc6..a7db75e 100644 --- a/go.mod +++ b/go.mod @@ -4,6 +4,7 @@ go 1.16 require ( github.com/antonfisher/nested-logrus-formatter v1.3.0 + github.com/edwarnicke/grpcfd v0.1.0 github.com/kelseyhightower/envconfig v1.4.0 github.com/networkservicemesh/sdk v0.0.0-20210604144115-6bac2f97d499 github.com/networkservicemesh/sdk-k8s v0.0.0-20210604144639-7ae7dbf76906 diff --git a/main.go b/main.go index a733b45..55f7202 100644 --- a/main.go +++ b/main.go @@ -24,6 +24,8 @@ import ( "syscall" "time" + "github.com/edwarnicke/grpcfd" + "github.com/networkservicemesh/sdk-k8s/pkg/registry/chains/registryk8s" "github.com/networkservicemesh/sdk-k8s/pkg/tools/k8s" "github.com/networkservicemesh/sdk/pkg/tools/jaeger" @@ -105,8 +107,18 @@ func main() { serverOptions := append(opentracing.WithTracing(), grpc.Creds(credsTLS)) server := grpc.NewServer(serverOptions...) - clientOptions := append(opentracing.WithTracingDial(), grpc.WithBlock(), grpc.WithTransportCredentials(credsTLS)) - + clientOptions := append( + opentracing.WithTracingDial(), + grpc.WithBlock(), + grpc.WithDefaultCallOptions(grpc.WaitForReady(true)), + grpc.WithTransportCredentials( + grpcfd.TransportCredentials( + credentials.NewTLS( + tlsconfig.MTLSClientConfig(source, source, tlsconfig.AuthorizeAny()), + ), + ), + ), + ) client, _, _ := k8s.NewVersionedClient() config.ClientSet = client diff --git a/pkg/internal/imports/imports_linux.go b/pkg/internal/imports/imports_linux.go index c42893e..861eea9 100644 --- a/pkg/internal/imports/imports_linux.go +++ b/pkg/internal/imports/imports_linux.go @@ -4,6 +4,7 @@ package imports import ( _ "context" _ "github.com/antonfisher/nested-logrus-formatter" + _ "github.com/edwarnicke/grpcfd" _ "github.com/kelseyhightower/envconfig" _ "github.com/networkservicemesh/sdk-k8s/pkg/registry/chains/registryk8s" _ "github.com/networkservicemesh/sdk-k8s/pkg/tools/k8s" From 9ec64b3c90acee0bef8b92e59b823efe4ae5773a Mon Sep 17 00:00:00 2001 From: Denis Tingaikin Date: Sun, 6 Jun 2021 20:42:21 +0700 Subject: [PATCH 2/2] fix windows job Signed-off-by: Denis Tingaikin --- main.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/main.go b/main.go index 55f7202..01d40eb 100644 --- a/main.go +++ b/main.go @@ -14,6 +14,8 @@ // See the License for the specific language governing permissions and // limitations under the License. +// +build !windows + package main import (