github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-22 19:31:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80930 from liu-cong/normalizescore-api-change

Browse Source 
Remove NormalizeScore plugin set from config API.
This commit is contained in:
Kubernetes Prow Robot 2019-08-21 14:52:33 -07:00 committed by GitHub
commit 1a53325550
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/scheduler/apis/config/types.go
View File

@ -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
// 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

2
pkg/scheduler/apis/config/v1alpha1/zz_generated.conversion.go generated
View File

@ -298,7 +298,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))
@ -319,7 +318,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))

5
pkg/scheduler/apis/config/zz_generated.deepcopy.go generated
View File

@ -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)

3
staging/src/k8s.io/kube-scheduler/config/v1alpha1/types.go
View File

@ -163,9 +163,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"`

5
staging/src/k8s.io/kube-scheduler/config/v1alpha1/zz_generated.deepcopy.go generated
View File

@ -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)