From c7b1d67b6ba7a633d57d14d61330c3614b84c436 Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Tue, 19 May 2020 15:07:31 +0300 Subject: [PATCH] nfd-worker: drop deprecated grpc.WithTimeout --- pkg/nfd-worker/nfd-worker.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/nfd-worker/nfd-worker.go b/pkg/nfd-worker/nfd-worker.go index ef4f43169..aa7a1ed29 100644 --- a/pkg/nfd-worker/nfd-worker.go +++ b/pkg/nfd-worker/nfd-worker.go @@ -188,7 +188,9 @@ func (w *nfdWorker) connect() error { } // Dial and create a client - dialOpts := []grpc.DialOption{grpc.WithBlock(), grpc.WithTimeout(60 * time.Second)} + dialCtx, cancel := context.WithTimeout(context.Background(), 60*time.Second) + defer cancel() + dialOpts := []grpc.DialOption{grpc.WithBlock()} if w.args.CaFile != "" || w.args.CertFile != "" || w.args.KeyFile != "" { // Load client cert for client authentication cert, err := tls.LoadX509KeyPair(w.args.CertFile, w.args.KeyFile) @@ -214,7 +216,7 @@ func (w *nfdWorker) connect() error { } else { dialOpts = append(dialOpts, grpc.WithInsecure()) } - conn, err := grpc.Dial(w.args.Server, dialOpts...) + conn, err := grpc.DialContext(dialCtx, w.args.Server, dialOpts...) if err != nil { return err }