From b9e60d80301d6bbb6d79cba14d4e4717adf51937 Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Fri, 4 Aug 2017 11:11:55 -0400 Subject: [PATCH] Implment reading of rescheduler's policy. --- pkg/api/v1alpha1/defaults.go | 2 +- pkg/rescheduler/resheduler.go | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pkg/api/v1alpha1/defaults.go b/pkg/api/v1alpha1/defaults.go index a4733c3db..d9b82d90c 100644 --- a/pkg/api/v1alpha1/defaults.go +++ b/pkg/api/v1alpha1/defaults.go @@ -19,5 +19,5 @@ package v1alpha1 import "k8s.io/apimachinery/pkg/runtime" func addDefaultingFuncs(scheme *runtime.Scheme) error { - return RegisterDefaults(scheme) + return nil //RegisterDefaults(scheme) } diff --git a/pkg/rescheduler/resheduler.go b/pkg/rescheduler/resheduler.go index aa42aea37..26a9023bc 100644 --- a/pkg/rescheduler/resheduler.go +++ b/pkg/rescheduler/resheduler.go @@ -17,9 +17,13 @@ limitations under the License. package rescheduler import ( - "fmt" + "encoding/json" + //"fmt" + "io/ioutil" + //"os" "github.com/aveshagarwal/rescheduler/cmd/rescheduler/app/options" + "github.com/aveshagarwal/rescheduler/pkg/api/v1alpha1" "github.com/aveshagarwal/rescheduler/pkg/rescheduler/client" eutils "github.com/aveshagarwal/rescheduler/pkg/rescheduler/evictions/utils" "github.com/aveshagarwal/rescheduler/pkg/rescheduler/strategies" @@ -32,6 +36,17 @@ func Run(rs *options.ReschedulerServer) error { } rs.Client = rsclient + reschedulerPolicy := v1alpha1.ReschedulerPolicy{} + if len(rs.PolicyConfigFile) > 0 { + data, err := ioutil.ReadFile(rs.PolicyConfigFile) + if err != nil { + return err + } + if err := json.Unmarshal(data, &reschedulerPolicy); err != nil { + return err + } + } + policyGroupVersion, err := eutils.SupportEviction(rs.Client) if err != nil || len(policyGroupVersion) == 0 { return err