From 718efe69e167b1be0ca29b70b243b5f3403986bf Mon Sep 17 00:00:00 2001 From: Avesh Agarwal Date: Sun, 6 Aug 2017 15:58:30 -0400 Subject: [PATCH] Move ReschedulingInterval to rescheduler's configuration out of rescheduler's policy. --- pkg/api/types.go | 3 --- pkg/api/v1alpha1/types.go | 3 --- pkg/apis/componentconfig/types.go | 3 +++ pkg/apis/componentconfig/v1alpha1/types.go | 3 +++ 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkg/api/types.go b/pkg/api/types.go index 7339e3535..2b229c9eb 100644 --- a/pkg/api/types.go +++ b/pkg/api/types.go @@ -26,9 +26,6 @@ import ( type ReschedulerPolicy struct { metav1.TypeMeta - // Time interval for rescheduler to run - ReschedulingInterval time.Duration - // Strategies Strategies StrategyList } diff --git a/pkg/api/v1alpha1/types.go b/pkg/api/v1alpha1/types.go index fd95df7ec..20b002458 100644 --- a/pkg/api/v1alpha1/types.go +++ b/pkg/api/v1alpha1/types.go @@ -26,9 +26,6 @@ import ( type ReschedulerPolicy struct { metav1.TypeMeta `json:",inline"` - // Time interval for rescheduler to run - ReschedulingInterval time.Duration `json:"reschedulingInterval,omitempty"` - // Strategies Strategies StrategyList `json:"strategies,omitempty"` } diff --git a/pkg/apis/componentconfig/types.go b/pkg/apis/componentconfig/types.go index c3eda643d..d909a7ad1 100644 --- a/pkg/apis/componentconfig/types.go +++ b/pkg/apis/componentconfig/types.go @@ -23,6 +23,9 @@ import ( type ReschedulerConfiguration struct { metav1.TypeMeta + // Time interval for rescheduler to run + ReschedulingInterval time.Duration + // KubeconfigFile is path to kubeconfig file with authorization and master // location information. KubeconfigFile string diff --git a/pkg/apis/componentconfig/v1alpha1/types.go b/pkg/apis/componentconfig/v1alpha1/types.go index 7ffa203b2..4472e0e8a 100644 --- a/pkg/apis/componentconfig/v1alpha1/types.go +++ b/pkg/apis/componentconfig/v1alpha1/types.go @@ -23,6 +23,9 @@ import ( type ReschedulerConfiguration struct { metav1.TypeMeta `json:",inline"` + // Time interval for rescheduler to run + ReschedulingInterval time.Duration `json:"reschedulingInterval,omitempty"` + // KubeconfigFile is path to kubeconfig file with authorization and master // location information. KubeconfigFile string `json:"kubeconfigFile"`