Merge pull request #138 from denis-tingaikin/fix-client-options

qfix: clientOptions are wrong for interdomain scenario
networkservicemesh · Jun 6, 2021 · 1e7146a · 1e7146a
2 parents 82ec657 + 9ec64b3
commit 1e7146a
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git 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
@@ -14,6 +14,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+// +build !windows
+
 package main
 
 import (
@@ -24,6 +26,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 +109,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