@@ -38,7 +38,7 @@ import (
38
38
conformance_epp "sigs.k8s.io/gateway-api-inference-extension/conformance/testing-epp"
39
39
"sigs.k8s.io/gateway-api-inference-extension/internal/runnable"
40
40
backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics"
41
- "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/common/config"
41
+ "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/common/config/loader "
42
42
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/datastore"
43
43
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics"
44
44
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics/collectors"
@@ -216,29 +216,28 @@ func (r *Runner) Run(ctx context.Context) error {
216
216
}
217
217
218
218
if len (* configText ) != 0 || len (* configFile ) != 0 {
219
- theConfig , err := config .LoadConfig ([]byte (* configText ), * configFile )
219
+ theConfig , err := loader .LoadConfig ([]byte (* configText ), * configFile )
220
220
if err != nil {
221
221
setupLog .Error (err , "Failed to load the configuration" )
222
222
return err
223
223
}
224
224
225
- epp := eppHandle {}
226
- instantiatedPlugins , err := config .LoadPluginReferences (theConfig .Plugins , epp )
225
+ epp := newEppHandle ()
226
+
227
+ err = loader .LoadPluginReferences (theConfig .Plugins , epp )
227
228
if err != nil {
228
229
setupLog .Error (err , "Failed to instantiate the plugins" )
229
230
return err
230
231
}
231
232
232
- r .schedulerConfig , err = scheduling .LoadSchedulerConfig (theConfig .SchedulingProfiles , instantiatedPlugins )
233
+ r .schedulerConfig , err = loader .LoadSchedulerConfig (theConfig .SchedulingProfiles , epp )
233
234
if err != nil {
234
235
setupLog .Error (err , "Failed to create Scheduler configuration" )
235
236
return err
236
237
}
237
238
238
- // Add requestcontrol plugins
239
- if instantiatedPlugins != nil {
240
- r .requestControlConfig = requestcontrol .LoadRequestControlConfig (instantiatedPlugins )
241
- }
239
+ // Add requestControl plugins
240
+ r .requestControlConfig .AddPlugins (epp .Plugins ().GetAllPlugins ()... )
242
241
}
243
242
244
243
// --- Initialize Core EPP Components ---
0 commit comments