Skip to content

Commit 0107e02

Browse files
committed
Use the same options as the deprecated 'Dial'
Signed-off-by: Ryan Swanson <ryan.swanson@loft.sh>
1 parent 3312bd7 commit 0107e02

File tree

13 files changed

+11
-800
lines changed

13 files changed

+11
-800
lines changed

.github/workflows/e2e-tests.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757

5858
- name: Build devspacehelper
5959
run: |
60-
export GOMODCACHE="${{ github.workspace }}/.gomodcache"
60+
mkdir -p ~/.devspace/devspacehelper/latest
6161
CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-extldflags=-static" -o ~/.devspace/devspacehelper/latest/devspacehelper helper/main.go
6262
chmod +x ~/.devspace/devspacehelper/latest/devspacehelper
6363
env:

helper/util/conn.go

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,25 @@ package util
22

33
import (
44
"context"
5-
"google.golang.org/grpc/credentials/insecure"
65
"io"
76
"net"
87

98
"google.golang.org/grpc"
9+
"google.golang.org/grpc/credentials/insecure"
10+
"google.golang.org/grpc/resolver"
1011
)
1112

1213
// NewClientConnection creates a new client connection for the given reader and writer
1314
func NewClientConnection(reader io.Reader, writer io.Writer) (*grpc.ClientConn, error) {
1415
pipe := NewStdStreamJoint(reader, writer, false)
1516

17+
resolver.SetDefaultScheme("passthrough")
1618
// Set up a connection to the server.
17-
return grpc.NewClient("", grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) {
18-
return pipe, nil
19-
}))
19+
return grpc.NewClient("",
20+
grpc.WithTransportCredentials(insecure.NewCredentials()),
21+
grpc.WithContextDialer(func(ctx context.Context, addr string) (net.Conn, error) {
22+
return pipe, nil
23+
}),
24+
grpc.WithLocalDNSResolution(),
25+
grpc.WithDefaultCallOptions())
2026
}

vendor/github.com/docker/docker/pkg/archive/archive_deprecated.go

Lines changed: 0 additions & 259 deletions
This file was deleted.

vendor/github.com/docker/docker/pkg/archive/changes_deprecated.go

Lines changed: 0 additions & 56 deletions
This file was deleted.

0 commit comments

Comments
 (0)