From 95b1bc17745b15f70fb2eeff04bf08edb3c85241 Mon Sep 17 00:00:00 2001 From: Cong Liu Date: Fri, 2 Aug 2019 16:49:25 -0400 Subject: [PATCH] Remove NormalizeScore plugin set from config API. --- pkg/scheduler/apis/config/types.go | 3 --- .../apis/config/v1alpha1/zz_generated.conversion.go | 2 -- pkg/scheduler/apis/config/zz_generated.deepcopy.go | 5 ----- staging/src/k8s.io/kube-scheduler/config/v1alpha1/types.go | 3 --- .../kube-scheduler/config/v1alpha1/zz_generated.deepcopy.go | 5 ----- 5 files changed, 18 deletions(-) diff --git a/pkg/scheduler/apis/config/types.go b/pkg/scheduler/apis/config/types.go index 4c2c5f8c2c2..957371b6cd3 100644 --- a/pkg/scheduler/apis/config/types.go +++ b/pkg/scheduler/apis/config/types.go @@ -165,9 +165,6 @@ type Plugins struct { // Score is a list of plugins that should be invoked when ranking nodes that have passed the filtering phase. Score *PluginSet - // NormalizeScore is a list of plugins that should be invoked after the scoring phase to normalize scores. - NormalizeScore *PluginSet - // Reserve is a list of plugins invoked when reserving a node to run the pod. Reserve *PluginSet diff --git a/pkg/scheduler/apis/config/v1alpha1/zz_generated.conversion.go b/pkg/scheduler/apis/config/v1alpha1/zz_generated.conversion.go index 863225c37fa..6383f974c20 100644 --- a/pkg/scheduler/apis/config/v1alpha1/zz_generated.conversion.go +++ b/pkg/scheduler/apis/config/v1alpha1/zz_generated.conversion.go @@ -300,7 +300,6 @@ func autoConvert_v1alpha1_Plugins_To_config_Plugins(in *v1alpha1.Plugins, out *c out.Filter = (*config.PluginSet)(unsafe.Pointer(in.Filter)) out.PostFilter = (*config.PluginSet)(unsafe.Pointer(in.PostFilter)) out.Score = (*config.PluginSet)(unsafe.Pointer(in.Score)) - out.NormalizeScore = (*config.PluginSet)(unsafe.Pointer(in.NormalizeScore)) out.Reserve = (*config.PluginSet)(unsafe.Pointer(in.Reserve)) out.Permit = (*config.PluginSet)(unsafe.Pointer(in.Permit)) out.PreBind = (*config.PluginSet)(unsafe.Pointer(in.PreBind)) @@ -321,7 +320,6 @@ func autoConvert_config_Plugins_To_v1alpha1_Plugins(in *config.Plugins, out *v1a out.Filter = (*v1alpha1.PluginSet)(unsafe.Pointer(in.Filter)) out.PostFilter = (*v1alpha1.PluginSet)(unsafe.Pointer(in.PostFilter)) out.Score = (*v1alpha1.PluginSet)(unsafe.Pointer(in.Score)) - out.NormalizeScore = (*v1alpha1.PluginSet)(unsafe.Pointer(in.NormalizeScore)) out.Reserve = (*v1alpha1.PluginSet)(unsafe.Pointer(in.Reserve)) out.Permit = (*v1alpha1.PluginSet)(unsafe.Pointer(in.Permit)) out.PreBind = (*v1alpha1.PluginSet)(unsafe.Pointer(in.PreBind)) diff --git a/pkg/scheduler/apis/config/zz_generated.deepcopy.go b/pkg/scheduler/apis/config/zz_generated.deepcopy.go index 417f17a769b..746a51b2fbf 100644 --- a/pkg/scheduler/apis/config/zz_generated.deepcopy.go +++ b/pkg/scheduler/apis/config/zz_generated.deepcopy.go @@ -174,11 +174,6 @@ func (in *Plugins) DeepCopyInto(out *Plugins) { *out = new(PluginSet) (*in).DeepCopyInto(*out) } - if in.NormalizeScore != nil { - in, out := &in.NormalizeScore, &out.NormalizeScore - *out = new(PluginSet) - (*in).DeepCopyInto(*out) - } if in.Reserve != nil { in, out := &in.Reserve, &out.Reserve *out = new(PluginSet) diff --git a/staging/src/k8s.io/kube-scheduler/config/v1alpha1/types.go b/staging/src/k8s.io/kube-scheduler/config/v1alpha1/types.go index 1cea11f9fdb..6c6ed43a3b7 100644 --- a/staging/src/k8s.io/kube-scheduler/config/v1alpha1/types.go +++ b/staging/src/k8s.io/kube-scheduler/config/v1alpha1/types.go @@ -161,9 +161,6 @@ type Plugins struct { // Score is a list of plugins that should be invoked when ranking nodes that have passed the filtering phase. Score *PluginSet `json:"score,omitempty"` - // NormalizeScore is a list of plugins that should be invoked after the scoring phase to normalize scores. - NormalizeScore *PluginSet `json:"normalizeScore,omitempty"` - // Reserve is a list of plugins invoked when reserving a node to run the pod. Reserve *PluginSet `json:"reserve,omitempty"` diff --git a/staging/src/k8s.io/kube-scheduler/config/v1alpha1/zz_generated.deepcopy.go b/staging/src/k8s.io/kube-scheduler/config/v1alpha1/zz_generated.deepcopy.go index 1779f5c67b7..3693ebde639 100644 --- a/staging/src/k8s.io/kube-scheduler/config/v1alpha1/zz_generated.deepcopy.go +++ b/staging/src/k8s.io/kube-scheduler/config/v1alpha1/zz_generated.deepcopy.go @@ -174,11 +174,6 @@ func (in *Plugins) DeepCopyInto(out *Plugins) { *out = new(PluginSet) (*in).DeepCopyInto(*out) } - if in.NormalizeScore != nil { - in, out := &in.NormalizeScore, &out.NormalizeScore - *out = new(PluginSet) - (*in).DeepCopyInto(*out) - } if in.Reserve != nil { in, out := &in.Reserve, &out.Reserve *out = new(PluginSet)