Merge pull request #63073 from andyxning/refactor_grpc_dial_with_dialcontext

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. refactor device plugin grpc dial with dialcontext **What this PR does / why we need it**: Refactor grpc `dial` with `dialContext` as `grpc.WithTimeout` has been deprecated by: > use DialContext and context.WithTimeout instead. **Special notes for your reviewer**: **Release note**: ```release-note NONE ```

Merge pull request #63073 from andyxning/refactor_grpc_dial_with_dialcontext
4f561275 · Kubernetes Submit Queue · GitHub · 456b56a2 · b01657d0 · 4f561275
Unverified Commit 4f561275 authored May 03, 2018 by Kubernetes Submit Queue Committed by GitHub May 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 4 deletions

device_plugin_stub.go pkg/kubelet/cm/devicemanager/device_plugin_stub.go +4 -2

endpoint.go pkg/kubelet/cm/devicemanager/endpoint.go +4 -2

No files found.
--- a/pkg/kubelet/cm/devicemanager/device_plugin_stub.go
+++ b/pkg/kubelet/cm/devicemanager/device_plugin_stub.go
@@ -120,8 +120,10 @@ func (m *Stub) Stop() error {
 // Register registers the device plugin for the given resourceName with Kubelet.
 func (m *Stub) Register(kubeletEndpoint, resourceName string, preStartContainerFlag bool) error {
-	conn, err := grpc.Dial(kubeletEndpoint, grpc.WithInsecure(), grpc.WithBlock(),
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-		grpc.WithTimeout(10*time.Second),
+	defer cancel()
+	conn, err := grpc.DialContext(ctx, kubeletEndpoint, grpc.WithInsecure(), grpc.WithBlock(),
 		grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
 			return net.DialTimeout("unix", addr, timeout)
 		}))

--- a/pkg/kubelet/cm/devicemanager/endpoint.go
+++ b/pkg/kubelet/cm/devicemanager/endpoint.go
@@ -244,8 +244,10 @@ func (e *endpointImpl) stop() {
 // dial establishes the gRPC communication with the registered device plugin. https://godoc.org/google.golang.org/grpc#Dial
 func dial(unixSocketPath string) (pluginapi.DevicePluginClient, *grpc.ClientConn, error) {
-	c, err := grpc.Dial(unixSocketPath, grpc.WithInsecure(), grpc.WithBlock(),
+	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-		grpc.WithTimeout(10*time.Second),
+	defer cancel()
+	c, err := grpc.DialContext(ctx, unixSocketPath, grpc.WithInsecure(), grpc.WithBlock(),
 		grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
 			return net.DialTimeout("unix", addr, timeout)
 		}),