From bc5e6536607a9c9875f71d9426b5816ae15e8598 Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Fri, 4 Aug 2017 10:38:27 -0400
Subject: [PATCH] Update rescheduler implementation.

---
 cmd/rescheduler/app/server.go | 40 ++-----------------------------
 pkg/rescheduler/resheduler.go | 45 +++++++++++++++++++++++++++++++++++
 2 files changed, 47 insertions(+), 38 deletions(-)

diff --git a/cmd/rescheduler/app/server.go b/cmd/rescheduler/app/server.go
index beb12a35d..b38f907ea 100644
--- a/cmd/rescheduler/app/server.go
+++ b/cmd/rescheduler/app/server.go
@@ -21,11 +21,7 @@ import (
 	"fmt"
 
 	"github.com/aveshagarwal/rescheduler/cmd/rescheduler/app/options"
-	"github.com/aveshagarwal/rescheduler/pkg/rescheduler/client"
-	//"github.com/aveshagarwal/rescheduler/pkg/rescheduler/node"
-	//"github.com/aveshagarwal/rescheduler/pkg/rescheduler/pod"
-	eutils "github.com/aveshagarwal/rescheduler/pkg/rescheduler/evictions/utils"
-	"github.com/aveshagarwal/rescheduler/pkg/rescheduler/strategies"
+	"github.com/aveshagarwal/rescheduler/pkg/rescheduler"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/pflag"
@@ -52,37 +48,5 @@ func NewReschedulerCommand() *cobra.Command {
 }
 
 func Run(rs *options.ReschedulerServer) error {
-	rsclient, err := client.CreateClient(rs.KubeconfigFile)
-	if err != nil {
-		return err
-	}
-	rs.Client = rsclient
-
-	policyGroupVersion, err := eutils.SupportEviction(rs.Client)
-	if err != nil || len(policyGroupVersion) == 0 {
-		return err
-	}
-
-	strategies.RemoveDuplicatePods(rs.Client, policyGroupVersion)
-	/*stopChannel := make(chan struct{})
-	nodes, err := node.ReadyNodes(rs.Client, stopChannel)
-	if err != nil {
-		return err
-	}
-
-	for _, n := range nodes {
-		fmt.Printf("\nnode = %#v\n", n)
-	}
-
-	for _, node := range nodes {
-		pods, err := pod.ListPodsOnANode(rs.Client, node)
-		if err != nil {
-			return err
-		}
-
-		for _, p := range pods {
-			fmt.Printf("\npod = %#v\n", p)
-		}
-	}*/
-	return nil
+	return rescheduler.Run(rs)
 }
diff --git a/pkg/rescheduler/resheduler.go b/pkg/rescheduler/resheduler.go
index 2b3959003..aa42aea37 100644
--- a/pkg/rescheduler/resheduler.go
+++ b/pkg/rescheduler/resheduler.go
@@ -15,3 +15,48 @@ limitations under the License.
 */
 
 package rescheduler
+
+import (
+	"fmt"
+
+	"github.com/aveshagarwal/rescheduler/cmd/rescheduler/app/options"
+	"github.com/aveshagarwal/rescheduler/pkg/rescheduler/client"
+	eutils "github.com/aveshagarwal/rescheduler/pkg/rescheduler/evictions/utils"
+	"github.com/aveshagarwal/rescheduler/pkg/rescheduler/strategies"
+)
+
+func Run(rs *options.ReschedulerServer) error {
+	rsclient, err := client.CreateClient(rs.KubeconfigFile)
+	if err != nil {
+		return err
+	}
+	rs.Client = rsclient
+
+	policyGroupVersion, err := eutils.SupportEviction(rs.Client)
+	if err != nil || len(policyGroupVersion) == 0 {
+		return err
+	}
+
+	strategies.RemoveDuplicatePods(rs.Client, policyGroupVersion)
+	/*stopChannel := make(chan struct{})
+	  nodes, err := node.ReadyNodes(rs.Client, stopChannel)
+	  if err != nil {
+	          return err
+	  }
+
+	  for _, n := range nodes {
+	          fmt.Printf("\nnode = %#v\n", n)
+	  }
+
+	  for _, node := range nodes {
+	          pods, err := pod.ListPodsOnANode(rs.Client, node)
+	          if err != nil {
+	                  return err
+	          }
+
+	          for _, p := range pods {
+	                  fmt.Printf("\npod = %#v\n", p)
+	          }
+	  }*/
+	return nil
+}