ソースを参照

replaced call to deprecated grpc method WithDialer with WithContextDialer

Signed-off-by: Justen Martin <jmart@the-coder.com>
Justen Martin 5 年 前
コミット
3b49bd1d84
2 ファイル変更1 行追加5 行削除
  1. 1 1
      daemon/daemon.go
  2. 0 4
      hack/validate/golangci-lint.yml

+ 1 - 1
daemon/daemon.go

@@ -887,7 +887,7 @@ func NewDaemon(ctx context.Context, config *config.Config, pluginStore *plugin.S
 	gopts := []grpc.DialOption{
 		grpc.WithInsecure(),
 		grpc.WithBackoffMaxDelay(3 * time.Second),
-		grpc.WithDialer(dialer.Dialer),
+		grpc.WithContextDialer(dialer.ContextDialer),
 
 		// TODO(stevvooe): We may need to allow configuration of this on the client.
 		grpc.WithDefaultCallOptions(grpc.MaxCallRecvMsgSize(defaults.DefaultMaxRecvMsgSize)),

+ 0 - 4
hack/validate/golangci-lint.yml

@@ -46,10 +46,6 @@ issues:
     - text: "G202: SQL string concatenation"
       linters:
         - gosec
-    # FIXME temporarily suppress these. See #39928
-    - text: "SA1019: grpc.WithDialer is deprecated"
-      linters:
-        - staticcheck
     # FIXME temporarily suppress these. See #39924
     - text: "SA1019: h.Xattrs is deprecated: Use PAXRecords instead"
       linters: