cleanup of unused fields and functions (kubernetes-sigs#1233)

nirrozenbaum · kfswain · commit aaa14e7832c8 · 2025-07-31T21:35:59.000Z
Signed-off-by: Nir Rozenbaum &lt;nirro@il.ibm.com&gt;
diff --git a/pkg/epp/controller/inferencemodel_reconciler.go b/pkg/epp/controller/inferencemodel_reconciler.go
@@ -22,7 +22,6 @@ import (
 
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
@@ -36,7 +35,6 @@ import (
 
 type InferenceModelReconciler struct {
 	client.Reader
-	Record             record.EventRecorder
 	Datastore          datastore.Datastore
 	PoolNamespacedName types.NamespacedName
 }
diff --git a/pkg/epp/controller/inferencemodel_reconciler_test.go b/pkg/epp/controller/inferencemodel_reconciler_test.go
@@ -26,7 +26,6 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
-	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/fake"
@@ -205,7 +204,6 @@ func TestInferenceModelReconciler(t *testing.T) {
 			_ = ds.PoolSet(context.Background(), fakeClient, pool)
 			reconciler := &InferenceModelReconciler{
 				Reader:             fakeClient,
-				Record:             record.NewFakeRecorder(10),
 				Datastore:          ds,
 				PoolNamespacedName: types.NamespacedName{Name: pool.Name, Namespace: pool.Namespace},
 			}
diff --git a/pkg/epp/controller/inferencepool_reconciler.go b/pkg/epp/controller/inferencepool_reconciler.go
@@ -20,7 +20,6 @@ import (
 	"context"
 
 	"k8s.io/apimachinery/pkg/api/errors"
-	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/log"
@@ -35,7 +34,6 @@ import (
 // will have the proper controller that will create/manage objects on behalf of the server pool.
 type InferencePoolReconciler struct {
 	client.Reader
-	Record    record.EventRecorder
 	Datastore datastore.Datastore
 }
 
diff --git a/pkg/epp/controller/inferencepool_reconciler_test.go b/pkg/epp/controller/inferencepool_reconciler_test.go
@@ -183,8 +183,10 @@ func diffStore(datastore datastore.Datastore, params diffStoreParams) string {
 	if params.wantModels == nil {
 		params.wantModels = []*v1alpha2.InferenceModel{}
 	}
-	gotModels := datastore.ModelGetAll()
-	if diff := utiltest.DiffModelLists(params.wantModels, gotModels); diff != "" {
+
+	if diff := cmp.Diff(params.wantModels, datastore.ModelGetAll(), cmpopts.SortSlices(func(a, b *v1alpha2.InferenceModel) bool {
+		return a.Name < b.Name
+	})); diff != "" {
 		return "models:" + diff
 	}
 	return ""
diff --git a/pkg/epp/controller/pod_reconciler.go b/pkg/epp/controller/pod_reconciler.go
@@ -23,7 +23,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/types"
-	"k8s.io/client-go/tools/record"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
@@ -38,7 +37,6 @@ import (
 type PodReconciler struct {
 	client.Reader
 	Datastore datastore.Datastore
-	Record    record.EventRecorder
 }
 
 func (c *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
diff --git a/pkg/epp/datastore/datastore_test.go b/pkg/epp/datastore/datastore_test.go
@@ -225,10 +225,11 @@ func TestModel(t *testing.T) {
 				t.Errorf("Unexpected operation result, want: %v, got: %v", test.wantOpResult, gotOpResult)
 			}
 
-			if diff := testutil.DiffModelLists(test.wantModels, ds.ModelGetAll()); diff != "" {
+			if diff := cmp.Diff(test.wantModels, ds.ModelGetAll(), cmpopts.SortSlices(func(a, b *v1alpha2.InferenceModel) bool {
+				return a.Name < b.Name
+			})); diff != "" {
 				t.Errorf("Unexpected models diff: %s", diff)
 			}
-
 		})
 	}
 }
diff --git a/pkg/epp/requestcontrol/request_control_config.go b/pkg/epp/requestcontrol/request_control_config.go
@@ -58,12 +58,3 @@ func (c *Config) AddPlugins(pluginObjects ...plugins.Plugin) {
 		}
 	}
 }
-
-func LoadRequestControlConfig(instantiatedPlugins map[string]plugins.Plugin) *Config {
-	config := NewConfig()
-	for _, plugin := range instantiatedPlugins {
-		config.AddPlugins(plugin)
-	}
-
-	return config
-}
diff --git a/pkg/epp/scheduling/framework/plugins/multi/prefix/plugin.go b/pkg/epp/scheduling/framework/plugins/multi/prefix/plugin.go
@@ -34,7 +34,6 @@ import (
 )
 
 const (
-	DefaultScorerWeight = 1
 	// vLLM default token block size is 16, and a good guess of average characters per token is 4.
 	DefaultHashBlockSize = 64
 	// The maximum number of blocks to match. Two long requests with the same prefix up to this
diff --git a/pkg/epp/scheduling/framework/plugins/scorer/kvcache.go b/pkg/epp/scheduling/framework/plugins/scorer/kvcache.go
@@ -26,8 +26,7 @@ import (
 )
 
 const (
-	DefaultKVCacheScorerWeight = 1
-	KvCacheScorerType          = "kv-cache-scorer"
+	KvCacheScorerType = "kv-cache-scorer"
 )
 
 // compile-time type assertion
diff --git a/pkg/epp/scheduling/framework/plugins/scorer/queue.go b/pkg/epp/scheduling/framework/plugins/scorer/queue.go
@@ -27,8 +27,7 @@ import (
 )
 
 const (
-	DefaultQueueScorerWeight = 1
-	QueueScorerType          = "queue-scorer"
+	QueueScorerType = "queue-scorer"
 )
 
 // compile-time type assertion
diff --git a/pkg/epp/scheduling/scheduler.go b/pkg/epp/scheduling/scheduler.go
@@ -24,17 +24,12 @@ import (
 
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
-	backendmetrics "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/backend/metrics"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/metrics"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/framework"
 	"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/types"
 	logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
 )
 
-type Datastore interface {
-	PodGetAll() []backendmetrics.PodMetrics
-}
-
 // NewSchedulerWithConfig returns a new scheduler with the given scheduler plugins configuration.
 func NewSchedulerWithConfig(config *SchedulerConfig) *Scheduler {
 	return &Scheduler{
diff --git a/pkg/epp/scheduling/types/cycle_state.go b/pkg/epp/scheduling/types/cycle_state.go
@@ -51,22 +51,6 @@ type CycleState struct {
 	storage sync.Map
 }
 
-// Clone creates a copy of CycleState and returns its pointer. Clone returns
-// nil if the context being cloned is nil.
-func (c *CycleState) Clone() *CycleState {
-	if c == nil {
-		return nil
-	}
-	copy := NewCycleState()
-	// Safe copy storage in case of overwriting.
-	c.storage.Range(func(k, v any) bool {
-		copy.storage.Store(k, v.(StateData).Clone())
-		return true
-	})
-
-	return copy
-}
-
 // Read retrieves data with the given "key" from CycleState. If the key is not
 // present, ErrNotFound is returned.
 //
diff --git a/pkg/epp/server/runserver.go b/pkg/epp/server/runserver.go
@@ -103,7 +103,6 @@ func (r *ExtProcServerRunner) SetupWithManager(ctx context.Context, mgr ctrl.Man
 	if err := (&controller.InferencePoolReconciler{
 		Datastore: r.Datastore,
 		Reader:    mgr.GetClient(),
-		Record:    mgr.GetEventRecorderFor("InferencePool"),
 	}).SetupWithManager(mgr); err != nil {
 		return fmt.Errorf("failed setting up InferencePoolReconciler: %w", err)
 	}
@@ -112,15 +111,13 @@ func (r *ExtProcServerRunner) SetupWithManager(ctx context.Context, mgr ctrl.Man
 		Datastore:          r.Datastore,
 		Reader:             mgr.GetClient(),
 		PoolNamespacedName: r.PoolNamespacedName,
-		Record:             mgr.GetEventRecorderFor("InferenceModel"),
 	}).SetupWithManager(ctx, mgr); err != nil {
 		return fmt.Errorf("failed setting up InferenceModelReconciler: %w", err)
 	}
 
 	if err := (&controller.PodReconciler{
 		Datastore: r.Datastore,
 		Reader:    mgr.GetClient(),
-		Record:    mgr.GetEventRecorderFor("pod"),
 	}).SetupWithManager(mgr); err != nil {
 		return fmt.Errorf("failed setting up PodReconciler: %v", err)
 	}
diff --git a/pkg/epp/util/testing/diff.go b/pkg/epp/util/testing/diff.go

Original file line number	Diff line number	Diff line change
`@@ -183,8 +183,10 @@ func diffStore(datastore datastore.Datastore, params diffStoreParams) string {`
`183`	`183`	`if params.wantModels == nil {`
`184`	`184`	`params.wantModels = []*v1alpha2.InferenceModel{}`
`185`	`185`	`}`
`186`		`- gotModels := datastore.ModelGetAll()`
`187`		`- if diff := utiltest.DiffModelLists(params.wantModels, gotModels); diff != "" {`
	`186`	`+`
	`187`	`+ if diff := cmp.Diff(params.wantModels, datastore.ModelGetAll(), cmpopts.SortSlices(func(a, b *v1alpha2.InferenceModel) bool {`
	`188`	`+ return a.Name < b.Name`
	`189`	`+ })); diff != "" {`
`188`	`190`	`return "models:" + diff`
`189`	`191`	`}`
`190`	`192`	`return ""`
Original file line number	Diff line number	Diff line change
`@@ -225,10 +225,11 @@ func TestModel(t *testing.T) {`
`225`	`225`	`t.Errorf("Unexpected operation result, want: %v, got: %v", test.wantOpResult, gotOpResult)`
`226`	`226`	`}`
`227`	`227`
`228`		`- if diff := testutil.DiffModelLists(test.wantModels, ds.ModelGetAll()); diff != "" {`
	`228`	`+ if diff := cmp.Diff(test.wantModels, ds.ModelGetAll(), cmpopts.SortSlices(func(a, b *v1alpha2.InferenceModel) bool {`
	`229`	`+ return a.Name < b.Name`
	`230`	`+ })); diff != "" {`
`229`	`231`	`t.Errorf("Unexpected models diff: %s", diff)`
`230`	`232`	`}`
`231`		`-`
`232`	`233`	`})`
`233`	`234`	`}`
`234`	`235`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,12 +58,3 @@ func (c *Config) AddPlugins(pluginObjects ...plugins.Plugin) {`
`58`	`58`	`}`
`59`	`59`	`}`
`60`	`60`	`}`
`61`		`-`
`62`		`-func LoadRequestControlConfig(instantiatedPlugins map[string]plugins.Plugin) *Config {`
`63`		`- config := NewConfig()`
`64`		`- for _, plugin := range instantiatedPlugins {`
`65`		`- config.AddPlugins(plugin)`
`66`		`- }`
`67`		`-`
`68`		`- return config`
`69`		`-}`
Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,6 @@ import (`
`34`	`34`	`)`
`35`	`35`
`36`	`36`	`const (`
`37`		`- DefaultScorerWeight = 1`
`38`	`37`	`// vLLM default token block size is 16, and a good guess of average characters per token is 4.`
`39`	`38`	`DefaultHashBlockSize = 64`
`40`	`39`	`// The maximum number of blocks to match. Two long requests with the same prefix up to this`
Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,7 @@ import (`
`26`	`26`	`)`
`27`	`27`
`28`	`28`	`const (`
`29`		`- DefaultKVCacheScorerWeight = 1`
`30`		`- KvCacheScorerType = "kv-cache-scorer"`
	`29`	`+ KvCacheScorerType = "kv-cache-scorer"`
`31`	`30`	`)`
`32`	`31`
`33`	`32`	`// compile-time type assertion`
Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,7 @@ import (`
`27`	`27`	`)`
`28`	`28`
`29`	`29`	`const (`
`30`		`- DefaultQueueScorerWeight = 1`
`31`		`- QueueScorerType = "queue-scorer"`
	`30`	`+ QueueScorerType = "queue-scorer"`
`32`	`31`	`)`
`33`	`32`
`34`	`33`	`// compile-time type assertion`