From c649c97cfb2e2cff175e52584e757b6254511fc3 Mon Sep 17 00:00:00 2001
From: Avesh Agarwal <avagarwa@redhat.com>
Date: Sun, 30 Jul 2017 19:11:08 -0400
Subject: [PATCH] Fix rescheduler compile errors.

---
 cmd/rescheduler/app/options/options.go | 4 ++--
 cmd/rescheduler/app/server.go          | 7 ++++++-
 pkg/rescheduler/client/client.go       | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/cmd/rescheduler/app/options/options.go b/cmd/rescheduler/app/options/options.go
index 3d962c263..71f824ff2 100644
--- a/cmd/rescheduler/app/options/options.go
+++ b/cmd/rescheduler/app/options/options.go
@@ -50,6 +50,6 @@ func NewReschedulerServer() *ReschedulerServer {
 
 // AddFlags adds flags for a specific SchedulerServer to the specified FlagSet
 func (rs *ReschedulerServer) AddFlags(fs *pflag.FlagSet) {
-	fs.StringVar(&rs.KubeconfigFile, "kubeconfig-file", s.KubeconfigFile, "File with  kube configuration.")
-	fs.StringVar(&rs.PolicyConfigFile, "policy-config-file", s.PolicyConfigFile, "File with rescheduler policy configuration.")
+	fs.StringVar(&rs.KubeconfigFile, "kubeconfig-file", rs.KubeconfigFile, "File with  kube configuration.")
+	fs.StringVar(&rs.PolicyConfigFile, "policy-config-file", rs.PolicyConfigFile, "File with rescheduler policy configuration.")
 }
diff --git a/cmd/rescheduler/app/server.go b/cmd/rescheduler/app/server.go
index 872d81ef4..e591899fe 100644
--- a/cmd/rescheduler/app/server.go
+++ b/cmd/rescheduler/app/server.go
@@ -49,6 +49,11 @@ func NewReschedulerCommand() *cobra.Command {
 }
 
 func Run(rs *options.ReschedulerServer) error {
-	rs.Client = client.CreateClient(rs.KubeconfigFile)
+	rsclient, err := client.CreateClient(rs.KubeconfigFile)
+
+	if err != nil {
+		return err
+	}
+	rs.Client = rsclient
 	return nil
 }
diff --git a/pkg/rescheduler/client/client.go b/pkg/rescheduler/client/client.go
index 8a9c2c79e..e9ee77dc3 100644
--- a/pkg/rescheduler/client/client.go
+++ b/pkg/rescheduler/client/client.go
@@ -14,11 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-package rescheduler
+package client
 
 import (
 	"fmt"
-	"os"
 
 	"k8s.io/client-go/rest"
 	"k8s.io/client-go/tools/clientcmd"
@@ -41,9 +40,10 @@ func CreateClient(kubeconfig string) (clientset.Interface, error) {
 		}
 
 	} else {
+		var err error
 		cfg, err = rest.InClusterConfig()
 		if err != nil {
-			return fmt.Errorf("Unable to build in cluster config: %v", err)
+			return nil, fmt.Errorf("Unable to build in cluster config: %v", err)
 		}
 	}