From 926d9012a4cca18ee7507b5d3b6b6fe2b0372982 Mon Sep 17 00:00:00 2001
From: Dmitry Rozhkov <dmitry.rozhkov@linux.intel.com>
Date: Wed, 9 Jan 2019 13:07:12 +0200
Subject: [PATCH] kubeadm: simplify creating etcdClient

There is no need to overshadow `client` with a transitive variable
used solely for transfering its value to `etcdClient`.
---
 cmd/kubeadm/app/cmd/upgrade/plan.go | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/cmd/kubeadm/app/cmd/upgrade/plan.go b/cmd/kubeadm/app/cmd/upgrade/plan.go
index 1e671ec198b..b507665ddaa 100644
--- a/cmd/kubeadm/app/cmd/upgrade/plan.go
+++ b/cmd/kubeadm/app/cmd/upgrade/plan.go
@@ -98,22 +98,17 @@ func runPlan(flags *planFlags, userVersion string) error {
 	// external etcd vs static pod etcd
 	isExternalEtcd := cfg.Etcd.External != nil
 	if isExternalEtcd {
-		client, err := etcdutil.New(
+		etcdClient, err = etcdutil.New(
 			cfg.Etcd.External.Endpoints,
 			cfg.Etcd.External.CAFile,
 			cfg.Etcd.External.CertFile,
 			cfg.Etcd.External.KeyFile)
-		if err != nil {
-			return err
-		}
-		etcdClient = client
 	} else {
 		// Connects to local/stacked etcd existing in the cluster
-		client, err := etcdutil.NewFromCluster(client, cfg.CertificatesDir)
-		if err != nil {
-			return err
-		}
-		etcdClient = client
+		etcdClient, err = etcdutil.NewFromCluster(client, cfg.CertificatesDir)
+	}
+	if err != nil {
+		return err
 	}
 
 	// Compute which upgrade possibilities there are