cmd/etcd-utils: fix list panic

Signed-off-by: Gyuho Lee <[email protected]>
aws · May 8, 2020 · 572b1cb · 572b1cb
1 parent d71b5d2
commit 572b1cb
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/cmd/etcd-utils/k8s/list.go b/cmd/etcd-utils/k8s/list.go
@@ -145,17 +145,18 @@ func listFunc(cmd *cobra.Command, args []string) {
 	}
 
 	var e etcd_client.Etcd
+	e, err = etcd_client.New(etcd_client.Config{
+		Logger:           lg,
+		EtcdClientConfig: clientv3.Config{LogConfig: &lcfg, Endpoints: endpoints},
+	})
+	if err != nil {
+		lg.Fatal("failed to create etcd instance")
+	}
+	defer func() {
+		e.Close()
+	}()
+
 	if listLeadershipElection {
-		e, err = etcd_client.New(etcd_client.Config{
-			Logger:           lg,
-			EtcdClientConfig: clientv3.Config{LogConfig: &lcfg, Endpoints: endpoints},
-		})
-		if err != nil {
-			lg.Fatal("failed to create etcd instance")
-		}
-		defer func() {
-			e.Close()
-		}()
 		ok, err := e.Campaign(listElectionPfx, listElectionTimeout)
 		if err != nil {
 			lg.Fatal("failed to campaign")