fix: dial issue

Signed-off-by: l1b0k <[email protected]>
AliyunContainerService · Jul 18, 2024 · a91e2c1 · a91e2c1
1 parent 3aba8b9
commit a91e2c1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/cmd/terway-cli/main.go b/cmd/terway-cli/main.go
@@ -34,7 +34,7 @@ var (
 		PersistentPreRunE: func(cmd *cobra.Command, _ []string) error {
 			// create connection and grpc client
 			ctx, contextCancel = context.WithTimeout(context.Background(), connTimeout)
-			conn, err := grpc.NewClient(defaultSocketPath, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithContextDialer(
+			conn, err := grpc.NewClient("passthrough:"+defaultSocketPath, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithContextDialer(
 				func(ctx context.Context, s string) (net.Conn, error) {
 					unixAddr, err := net.ResolveUnixAddr("unix", defaultSocketPath)
 					if err != nil {

diff --git a/deviceplugin/eni.go b/deviceplugin/eni.go
@@ -11,7 +11,6 @@ import (
 	"time"
 
 	"github.com/samber/lo"
-
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials/insecure"
@@ -86,7 +85,7 @@ func NewENIDevicePlugin(count int, eniType string) *ENIDevicePlugin {
 
 // dial establishes the gRPC communication with the registered device plugin.
 func dial(unixSocketPath string, timeout time.Duration) (*grpc.ClientConn, func(), error) {
-	c, err := grpc.NewClient(unixSocketPath, grpc.WithTransportCredentials(insecure.NewCredentials()),
+	c, err := grpc.NewClient("passthrough:"+unixSocketPath, grpc.WithTransportCredentials(insecure.NewCredentials()),
 		grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) {
 			return net.DialTimeout("unix", addr, timeout)
 		}))

diff --git a/plugin/terway/cni.go b/plugin/terway/cni.go
@@ -215,7 +215,7 @@ func cmdCheck(args *skel.CmdArgs) error {
 }
 
 func getNetworkClient(ctx context.Context) (rpc.TerwayBackendClient, *grpc.ClientConn, error) {
-	conn, err := grpc.NewClient(defaultSocketPath, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithContextDialer(
+	conn, err := grpc.NewClient("passthrough:"+defaultSocketPath, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithContextDialer(
 		func(ctx context.Context, s string) (net.Conn, error) {
 			unixAddr, err := net.ResolveUnixAddr("unix", s)
 			if err != nil {