Skip to content

Commit 4e1214c

Browse files
authored
Merge pull request kubernetes#83506 from alculquicondor/cleanup/framework_new
Cleanup reflection usage in framework creation
2 parents c0da7fc + 984c4e8 commit 4e1214c

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

pkg/scheduler/framework/v1alpha1/framework.go

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -103,47 +103,47 @@ func NewFramework(r Registry, plugins *config.Plugins, args []config.PluginConfi
103103
}
104104
}
105105

106-
if err := updatePluginList(reflect.ValueOf(&f.preFilterPlugins), plugins.PreFilter, reflect.TypeOf((*PreFilterPlugin)(nil)), pluginsMap); err != nil {
106+
if err := updatePluginList(&f.preFilterPlugins, plugins.PreFilter, pluginsMap); err != nil {
107107
return nil, err
108108
}
109109

110-
if err := updatePluginList(reflect.ValueOf(&f.filterPlugins), plugins.Filter, reflect.TypeOf((*FilterPlugin)(nil)), pluginsMap); err != nil {
110+
if err := updatePluginList(&f.filterPlugins, plugins.Filter, pluginsMap); err != nil {
111111
return nil, err
112112
}
113113

114-
if err := updatePluginList(reflect.ValueOf(&f.reservePlugins), plugins.Reserve, reflect.TypeOf((*ReservePlugin)(nil)), pluginsMap); err != nil {
114+
if err := updatePluginList(&f.reservePlugins, plugins.Reserve, pluginsMap); err != nil {
115115
return nil, err
116116
}
117117

118-
if err := updatePluginList(reflect.ValueOf(&f.postFilterPlugins), plugins.PostFilter, reflect.TypeOf((*PostFilterPlugin)(nil)), pluginsMap); err != nil {
118+
if err := updatePluginList(&f.postFilterPlugins, plugins.PostFilter, pluginsMap); err != nil {
119119
return nil, err
120120
}
121121

122-
if err := updatePluginList(reflect.ValueOf(&f.scorePlugins), plugins.Score, reflect.TypeOf((*ScorePlugin)(nil)), pluginsMap); err != nil {
122+
if err := updatePluginList(&f.scorePlugins, plugins.Score, pluginsMap); err != nil {
123123
return nil, err
124124
}
125125

126-
if err := updatePluginList(reflect.ValueOf(&f.preBindPlugins), plugins.PreBind, reflect.TypeOf((*PreBindPlugin)(nil)), pluginsMap); err != nil {
126+
if err := updatePluginList(&f.preBindPlugins, plugins.PreBind, pluginsMap); err != nil {
127127
return nil, err
128128
}
129129

130-
if err := updatePluginList(reflect.ValueOf(&f.bindPlugins), plugins.Bind, reflect.TypeOf((*BindPlugin)(nil)), pluginsMap); err != nil {
130+
if err := updatePluginList(&f.bindPlugins, plugins.Bind, pluginsMap); err != nil {
131131
return nil, err
132132
}
133133

134-
if err := updatePluginList(reflect.ValueOf(&f.postBindPlugins), plugins.PostBind, reflect.TypeOf((*PostBindPlugin)(nil)), pluginsMap); err != nil {
134+
if err := updatePluginList(&f.postBindPlugins, plugins.PostBind, pluginsMap); err != nil {
135135
return nil, err
136136
}
137137

138-
if err := updatePluginList(reflect.ValueOf(&f.unreservePlugins), plugins.Unreserve, reflect.TypeOf((*UnreservePlugin)(nil)), pluginsMap); err != nil {
138+
if err := updatePluginList(&f.unreservePlugins, plugins.Unreserve, pluginsMap); err != nil {
139139
return nil, err
140140
}
141141

142-
if err := updatePluginList(reflect.ValueOf(&f.permitPlugins), plugins.Permit, reflect.TypeOf((*PermitPlugin)(nil)), pluginsMap); err != nil {
142+
if err := updatePluginList(&f.permitPlugins, plugins.Permit, pluginsMap); err != nil {
143143
return nil, err
144144
}
145145

146-
if err := updatePluginList(reflect.ValueOf(&f.queueSortPlugins), plugins.QueueSort, reflect.TypeOf((*QueueSortPlugin)(nil)), pluginsMap); err != nil {
146+
if err := updatePluginList(&f.queueSortPlugins, plugins.QueueSort, pluginsMap); err != nil {
147147
return nil, err
148148
}
149149

@@ -160,13 +160,13 @@ func NewFramework(r Registry, plugins *config.Plugins, args []config.PluginConfi
160160
return f, nil
161161
}
162162

163-
func updatePluginList(pluginList reflect.Value, pluginSet *config.PluginSet, pluginType reflect.Type, pluginsMap map[string]Plugin) error {
163+
func updatePluginList(pluginList interface{}, pluginSet *config.PluginSet, pluginsMap map[string]Plugin) error {
164164
if pluginSet == nil {
165165
return nil
166166
}
167167

168-
plugins := pluginList.Elem()
169-
pluginType = pluginType.Elem()
168+
plugins := reflect.ValueOf(pluginList).Elem()
169+
pluginType := plugins.Type().Elem()
170170
set := sets.NewString()
171171
for _, ep := range pluginSet.Enabled {
172172
pg, ok := pluginsMap[ep.Name]

0 commit comments

Comments
 (0)