Use general csinodelister if csinodeawareness is disabled

gnufied · gnufied · commit 72f321e096e4 · 2025-11-07T16:12:03.000-05:00
diff --git a/cluster-autoscaler/simulator/framework/handle.go b/cluster-autoscaler/simulator/framework/handle.go
@@ -26,6 +26,7 @@ import (
 	schedulerconfiglatest "k8s.io/kubernetes/pkg/scheduler/apis/config/latest"
 	schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"
 	schedulerplugins "k8s.io/kubernetes/pkg/scheduler/framework/plugins"
+	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits"
 	schedulerframeworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"
 	schedulermetrics "k8s.io/kubernetes/pkg/scheduler/metrics"
 )
@@ -66,6 +67,9 @@ func NewHandle(informerFactory informers.SharedInformerFactory,
 	}
 	if csiEnabled {
 		opts = append(opts, schedulerframeworkruntime.WithSharedCSIManager(sharedLister))
+	} else {
+		sharedCSIManager := nodevolumelimits.NewCSIManager(informerFactory.Storage().V1().CSINodes().Lister())
+		opts = append(opts, schedulerframeworkruntime.WithSharedCSIManager(sharedCSIManager))
 	}
 	initMetricsOnce.Do(func() {
 		schedulermetrics.InitMetrics()

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ import (`
`26`	`26`	`schedulerconfiglatest "k8s.io/kubernetes/pkg/scheduler/apis/config/latest"`
`27`	`27`	`schedulerframework "k8s.io/kubernetes/pkg/scheduler/framework"`
`28`	`28`	`schedulerplugins "k8s.io/kubernetes/pkg/scheduler/framework/plugins"`
	`29`	`+ "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodevolumelimits"`
`29`	`30`	`schedulerframeworkruntime "k8s.io/kubernetes/pkg/scheduler/framework/runtime"`
`30`	`31`	`schedulermetrics "k8s.io/kubernetes/pkg/scheduler/metrics"`
`31`	`32`	`)`
`@@ -66,6 +67,9 @@ func NewHandle(informerFactory informers.SharedInformerFactory,`
`66`	`67`	`}`
`67`	`68`	`if csiEnabled {`
`68`	`69`	`opts = append(opts, schedulerframeworkruntime.WithSharedCSIManager(sharedLister))`
	`70`	`+ } else {`
	`71`	`+ sharedCSIManager := nodevolumelimits.NewCSIManager(informerFactory.Storage().V1().CSINodes().Lister())`
	`72`	`+ opts = append(opts, schedulerframeworkruntime.WithSharedCSIManager(sharedCSIManager))`
`69`	`73`	`}`
`70`	`74`	`initMetricsOnce.Do(func() {`
`71`	`75`	`schedulermetrics.InitMetrics()`