github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Replace deprecated methods in the logic involved in the construction of gRPC connection to kms-plugin.

Browse Source
This commit is contained in:
immutablet 2019-10-07 15:57:47 -07:00
parent 3d40c4cea2
commit e50c264c35
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
staging/src/k8s.io/apiserver/pkg/storage/value/encrypt/envelope/grpc_service.go
View File

@ -61,12 +61,11 @@ func NewGRPCService(endpoint string, callTimeout time.Duration) (Service, error)
return nil, err return nil, err
} }
connection, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithDefaultCallOptions(grpc.FailFast(false)), grpc.WithDialer( connection, err := grpc.Dial(addr, grpc.WithInsecure(), grpc.WithDefaultCallOptions(grpc.WaitForReady(true)), grpc.WithContextDialer(
func(string, time.Duration) (net.Conn, error) { func(context.Context, string) (net.Conn, error) {
// Ignoring addr and timeout arguments: // Ignoring addr and timeout arguments:
// addr - comes from the closure // addr - comes from the closure
// timeout - is ignored since we are connecting in a non-blocking configuration c, err := net.DialUnix(unixProtocol, nil, &net.UnixAddr{Name: addr})
c, err := net.DialTimeout(unixProtocol, addr, 0)
if err != nil { if err != nil {
klog.Errorf("failed to create connection to unix socket: %s, error: %v", addr, err) klog.Errorf("failed to create connection to unix socket: %s, error: %v", addr, err)
} }