From fe91cca2f37164340ac40289b09a04fe1ac3b66c Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Mon, 31 Jul 2017 18:54:26 -0400
Subject: [PATCH] Refactor code around utils and client.

---
 pkg/rescheduler/client/client.go | 21 ++++++++++++++++++---
 pkg/utils/utils.go               | 23 -----------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/pkg/rescheduler/client/client.go b/pkg/rescheduler/client/client.go
index e9ee77dc3..d6206602a 100644
--- a/pkg/rescheduler/client/client.go
+++ b/pkg/rescheduler/client/client.go
@@ -22,14 +22,12 @@ import (
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
-
-	"github.com/aveshagarwal/rescheduler/pkg/utils"
 )
 
 func CreateClient(kubeconfig string) (clientset.Interface, error) {
 	var cfg *rest.Config
 	if len(kubeconfig) != 0 {
-		master, err := utils.GetMasterFromKubeconfig(kubeconfig)
+		master, err := GetMasterFromKubeconfig(kubeconfig)
 		if err != nil {
 			return nil, fmt.Errorf("Failed to parse kubeconfig file: %v ", err)
 		}
@@ -49,3 +47,20 @@ func CreateClient(kubeconfig string) (clientset.Interface, error) {
 
 	return clientset.NewForConfig(cfg)
 }
+
+func GetMasterFromKubeconfig(filename string) (string, error) {
+	config, err := clientcmd.LoadFromFile(filename)
+	if err != nil {
+		return "", err
+	}
+
+	context, ok := config.Contexts[config.CurrentContext]
+	if !ok {
+		return "", fmt.Errorf("Failed to get master address from kubeconfig")
+	}
+
+	if val, ok := config.Clusters[context.Cluster]; ok {
+		return val.Server, nil
+	}
+	return "", fmt.Errorf("Failed to get master address from kubeconfig")
+}
diff --git a/pkg/utils/utils.go b/pkg/utils/utils.go
index 0e947d594..985bfc859 100644
--- a/pkg/utils/utils.go
+++ b/pkg/utils/utils.go
@@ -15,26 +15,3 @@ limitations under the License.
 */
 
 package utils
-
-import (
-	"fmt"
-
-	"k8s.io/client-go/tools/clientcmd"
-)
-
-func GetMasterFromKubeconfig(filename string) (string, error) {
-	config, err := clientcmd.LoadFromFile(filename)
-	if err != nil {
-		return "", err
-	}
-
-	context, ok := config.Contexts[config.CurrentContext]
-	if !ok {
-		return "", fmt.Errorf("Failed to get master address from kubeconfig")
-	}
-
-	if val, ok := config.Clusters[context.Cluster]; ok {
-		return val.Server, nil
-	}
-	return "", fmt.Errorf("Failed to get master address from kubeconfig")
-}