From 5bdcde484a810a46b6165b2a853f3f95a8394244 Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Sun, 6 Aug 2017 23:43:00 -0400
Subject: [PATCH] Update rescheduler's scheme implementation.

---
 cmd/rescheduler/app/options/options.go      | 8 +++-----
 pkg/apis/componentconfig/install/install.go | 4 ++--
 pkg/rescheduler/resheduler.go               | 4 ++++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/cmd/rescheduler/app/options/options.go b/cmd/rescheduler/app/options/options.go
index cb0fd1fb2..09bb91328 100644
--- a/cmd/rescheduler/app/options/options.go
+++ b/cmd/rescheduler/app/options/options.go
@@ -18,15 +18,13 @@ limitations under the License.
 package options
 
 import (
-	//"fmt"
-
-	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/client/clientset_generated/clientset"
 
 	// install the componentconfig api so we get its defaulting and conversion functions
 	"github.com/aveshagarwal/rescheduler/pkg/apis/componentconfig"
 	_ "github.com/aveshagarwal/rescheduler/pkg/apis/componentconfig/install"
 	"github.com/aveshagarwal/rescheduler/pkg/apis/componentconfig/v1alpha1"
+	reschedulerscheme "github.com/aveshagarwal/rescheduler/pkg/rescheduler/scheme"
 
 	"github.com/spf13/pflag"
 )
@@ -40,9 +38,9 @@ type ReschedulerServer struct {
 // NewReschedulerServer creates a new ReschedulerServer with default parameters
 func NewReschedulerServer() *ReschedulerServer {
 	versioned := v1alpha1.ReschedulerConfiguration{}
-	api.Scheme.Default(&versioned)
+	reschedulerscheme.Scheme.Default(&versioned)
 	cfg := componentconfig.ReschedulerConfiguration{}
-	api.Scheme.Convert(versioned, &cfg, nil)
+	reschedulerscheme.Scheme.Convert(versioned, &cfg, nil)
 	s := ReschedulerServer{
 		ReschedulerConfiguration: cfg,
 	}
diff --git a/pkg/apis/componentconfig/install/install.go b/pkg/apis/componentconfig/install/install.go
index cbceecfc0..a1b829904 100644
--- a/pkg/apis/componentconfig/install/install.go
+++ b/pkg/apis/componentconfig/install/install.go
@@ -21,14 +21,14 @@ import (
 	"k8s.io/apimachinery/pkg/apimachinery/announced"
 	"k8s.io/apimachinery/pkg/apimachinery/registered"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/api"
 
 	"github.com/aveshagarwal/rescheduler/pkg/apis/componentconfig"
 	"github.com/aveshagarwal/rescheduler/pkg/apis/componentconfig/v1alpha1"
+	reschedulerscheme "github.com/aveshagarwal/rescheduler/pkg/rescheduler/scheme"
 )
 
 func init() {
-	Install(api.GroupFactoryRegistry, api.Registry, api.Scheme)
+	Install(reschedulerscheme.GroupFactoryRegistry, reschedulerscheme.Registry, reschedulerscheme.Scheme)
 }
 
 // Install registers the API group and adds types to a scheme
diff --git a/pkg/rescheduler/resheduler.go b/pkg/rescheduler/resheduler.go
index 25a3d16a4..e1d7c2894 100644
--- a/pkg/rescheduler/resheduler.go
+++ b/pkg/rescheduler/resheduler.go
@@ -28,10 +28,14 @@ import (
 	"github.com/aveshagarwal/rescheduler/pkg/rescheduler/client"
 	eutils "github.com/aveshagarwal/rescheduler/pkg/rescheduler/evictions/utils"
 	nodeutil "github.com/aveshagarwal/rescheduler/pkg/rescheduler/node"
+	reschedulerscheme "github.com/aveshagarwal/rescheduler/pkg/rescheduler/scheme"
 	"github.com/aveshagarwal/rescheduler/pkg/rescheduler/strategies"
 )
 
 func Run(rs *options.ReschedulerServer) error {
+
+	fmt.Printf("all known types=%#v\n", reschedulerscheme.Scheme.AllKnownTypes())
+
 	rsclient, err := client.CreateClient(rs.KubeconfigFile)
 	if err != nil {
 		return err