From d2e829b0dec17bd88a9f23c507dbcec32c048103 Mon Sep 17 00:00:00 2001 From: Ismo Puustinen Date: Tue, 21 Aug 2018 15:31:53 +0300 Subject: [PATCH] deviceplugin: don't call a method on a nil value. If grpc.Dial() call fails, a nil connection is returned. Don't defer a conn.Close() call before checking the error value. --- internal/deviceplugin/server.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/internal/deviceplugin/server.go b/internal/deviceplugin/server.go index e9b2191e..7d06e477 100644 --- a/internal/deviceplugin/server.go +++ b/internal/deviceplugin/server.go @@ -245,10 +245,10 @@ func registerWithKubelet(kubeletSocket, pluginEndPoint, resourceName string) err grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) { return net.DialTimeout("unix", addr, timeout) })) - defer conn.Close() if err != nil { return errors.Wrap(err, "Cannot connect to kubelet service") } + defer conn.Close() client := pluginapi.NewRegistrationClient(conn) reqt := &pluginapi.RegisterRequest{ Version: pluginapi.Version,