Fixed merge and lint issue

Author: shmuelk

pkg/epp/scheduling/plugins/picker/max-score.go

@@ -3,6 +3,7 @@ package picker
 import (
 	"fmt"
 
+	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/plugins"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/types"
 	logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
 )
@@ -11,15 +12,15 @@ import (
 // candidates.
 type MaxScorePicker struct{}
 
-//var _ types.Picker = &MaxScorePicker{}
+var _ plugins.Picker = &MaxScorePicker{}
 
 // Name returns the name of the picker.
 func (msp *MaxScorePicker) Name() string {
 	return "max-score"
 }
 
 // Pick selects the pod with the maximum score from the list of candidates.
-func (msp *MaxScorePicker) Pick(ctx *types.SchedulingContext, pods []types.Pod) (*types.Result, error) {
+func (msp *MaxScorePicker) Pick(ctx *types.SchedulingContext, pods []types.Pod) *types.Result {
 	debugLogger := ctx.Logger.V(logutil.DEBUG).WithName("max-score-picker")
 	debugLogger.Info(fmt.Sprintf("Selecting the pod with the max score from %d candidates: %+v",
 		len(pods), pods))
@@ -38,17 +39,17 @@ func (msp *MaxScorePicker) Pick(ctx *types.SchedulingContext, pods []types.Pod)
 	}
 
 	if len(winners) == 0 {
-		return nil, nil
+		return nil
 	}
 
 	if len(winners) > 1 {
 		debugLogger.Info(fmt.Sprintf("Multiple pods have the same max score (%f): %+v",
 			maxScore, winners))
 
 		randomPicker := RandomPicker{}
-		return randomPicker.Pick(ctx, winners), nil
+		return randomPicker.Pick(ctx, winners)
 	}
 
 	debugLogger.Info(fmt.Sprintf("Selected pod with max score (%f): %+v", maxScore, winners[0]))
-	return &types.Result{TargetPod: winners[0]}, nil
+	return &types.Result{TargetPod: winners[0]}
 }