From fe3722dfa9a9015f2167149d77b1ccec16676db8 Mon Sep 17 00:00:00 2001 From: Hemant Kumar Date: Mon, 3 Nov 2025 12:05:06 -0500 Subject: [PATCH] Address review comments Change type name and stuff --- .../plugins/nodevolumelimits/csi_manager.go | 14 ++++----- pkg/scheduler/framework/runtime/framework.go | 31 +++++++++---------- pkg/scheduler/scheduler.go | 3 +- 3 files changed, 23 insertions(+), 25 deletions(-) diff --git a/pkg/scheduler/framework/plugins/nodevolumelimits/csi_manager.go b/pkg/scheduler/framework/plugins/nodevolumelimits/csi_manager.go index dd4bea5dc71..4cbaa53e204 100644 --- a/pkg/scheduler/framework/plugins/nodevolumelimits/csi_manager.go +++ b/pkg/scheduler/framework/plugins/nodevolumelimits/csi_manager.go @@ -24,18 +24,18 @@ import ( ) // CSIManagerImpl is a implementation of the CSIManager interface. -type CSIManagerImpl struct { - csiNodeListerImpl *csiNodeLister +type DefaultCSIManager struct { + defaultCSINodeLister *csiNodeLister } -var _ fwk.CSIManager = &CSIManagerImpl{} +var _ fwk.CSIManager = &DefaultCSIManager{} -func NewCSIManager(csinodeLister storagelisters.CSINodeLister) *CSIManagerImpl { - return &CSIManagerImpl{csiNodeListerImpl: NewCsiNodeLister(csinodeLister)} +func NewCSIManager(csinodeLister storagelisters.CSINodeLister) *DefaultCSIManager { + return &DefaultCSIManager{defaultCSINodeLister: NewCsiNodeLister(csinodeLister)} } -func (m *CSIManagerImpl) CSINodes() fwk.CSINodeLister { - return m.csiNodeListerImpl +func (m *DefaultCSIManager) CSINodes() fwk.CSINodeLister { + return m.defaultCSINodeLister } type csiNodeLister struct { diff --git a/pkg/scheduler/framework/runtime/framework.go b/pkg/scheduler/framework/runtime/framework.go index e527f8c20b0..f2bcf89e62b 100644 --- a/pkg/scheduler/framework/runtime/framework.go +++ b/pkg/scheduler/framework/runtime/framework.go @@ -54,22 +54,21 @@ const ( type frameworkImpl struct { registry Registry snapshotSharedLister fwk.SharedLister - - waitingPods *waitingPodsMap - scorePluginWeight map[string]int - preEnqueuePlugins []fwk.PreEnqueuePlugin - enqueueExtensions []fwk.EnqueueExtensions - queueSortPlugins []fwk.QueueSortPlugin - preFilterPlugins []fwk.PreFilterPlugin - filterPlugins []fwk.FilterPlugin - postFilterPlugins []fwk.PostFilterPlugin - preScorePlugins []fwk.PreScorePlugin - scorePlugins []fwk.ScorePlugin - reservePlugins []fwk.ReservePlugin - preBindPlugins []fwk.PreBindPlugin - bindPlugins []fwk.BindPlugin - postBindPlugins []fwk.PostBindPlugin - permitPlugins []fwk.PermitPlugin + waitingPods *waitingPodsMap + scorePluginWeight map[string]int + preEnqueuePlugins []fwk.PreEnqueuePlugin + enqueueExtensions []fwk.EnqueueExtensions + queueSortPlugins []fwk.QueueSortPlugin + preFilterPlugins []fwk.PreFilterPlugin + filterPlugins []fwk.FilterPlugin + postFilterPlugins []fwk.PostFilterPlugin + preScorePlugins []fwk.PreScorePlugin + scorePlugins []fwk.ScorePlugin + reservePlugins []fwk.ReservePlugin + preBindPlugins []fwk.PreBindPlugin + bindPlugins []fwk.BindPlugin + postBindPlugins []fwk.PostBindPlugin + permitPlugins []fwk.PermitPlugin // pluginsMap contains all plugins, by name. pluginsMap map[string]fwk.Plugin diff --git a/pkg/scheduler/scheduler.go b/pkg/scheduler/scheduler.go index 75a374f679e..5cedb3459a2 100644 --- a/pkg/scheduler/scheduler.go +++ b/pkg/scheduler/scheduler.go @@ -344,8 +344,7 @@ func New(ctx context.Context, } draManager = dynamicresources.NewDRAManager(ctx, resourceClaimCache, resourceSliceTracker, informerFactory) } - var sharedCSIManager fwk.CSIManager - sharedCSIManager = nodevolumelimits.NewCSIManager(informerFactory.Storage().V1().CSINodes().Lister()) + sharedCSIManager := nodevolumelimits.NewCSIManager(informerFactory.Storage().V1().CSINodes().Lister()) var apiDispatcher *apidispatcher.APIDispatcher if feature.DefaultFeatureGate.Enabled(features.SchedulerAsyncAPICalls) {