Skip to content

Commit 062057b

Browse files
authored
Merge pull request kubernetes-retired#725 from jiaxuanzhou/options
add options to enable the feature of PriorityClass
2 parents 5c8701e + db6cfeb commit 062057b

File tree

1 file changed

+21
-10
lines changed

1 file changed

+21
-10
lines changed

pkg/scheduler/cache/cache.go

+21-10
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ import (
4444
podutil "k8s.io/kubernetes/pkg/api/v1/pod"
4545
"k8s.io/kubernetes/pkg/scheduler/volumebinder"
4646

47+
"github.com/kubernetes-sigs/kube-batch/cmd/kube-batch/app/options"
4748
"github.com/kubernetes-sigs/kube-batch/pkg/apis/scheduling/v1alpha1"
4849
kbver "github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned"
4950
"github.com/kubernetes-sigs/kube-batch/pkg/client/clientset/versioned/scheme"
@@ -304,7 +305,10 @@ func (sc *SchedulerCache) Run(stopCh <-chan struct{}) {
304305
go sc.pvcInformer.Informer().Run(stopCh)
305306
go sc.scInformer.Informer().Run(stopCh)
306307
go sc.queueInformer.Informer().Run(stopCh)
307-
go sc.pcInformer.Informer().Run(stopCh)
308+
309+
if options.ServerOpts.EnablePriorityClass {
310+
go sc.pcInformer.Informer().Run(stopCh)
311+
}
308312

309313
// Re-sync error tasks.
310314
go wait.Until(sc.processResyncTask, 0, stopCh)
@@ -316,15 +320,22 @@ func (sc *SchedulerCache) Run(stopCh <-chan struct{}) {
316320
func (sc *SchedulerCache) WaitForCacheSync(stopCh <-chan struct{}) bool {
317321

318322
return cache.WaitForCacheSync(stopCh,
319-
sc.pdbInformer.Informer().HasSynced,
320-
sc.podInformer.Informer().HasSynced,
321-
sc.podGroupInformer.Informer().HasSynced,
322-
sc.nodeInformer.Informer().HasSynced,
323-
sc.pvInformer.Informer().HasSynced,
324-
sc.pvcInformer.Informer().HasSynced,
325-
sc.scInformer.Informer().HasSynced,
326-
sc.queueInformer.Informer().HasSynced,
327-
sc.pcInformer.Informer().HasSynced,
323+
func() []cache.InformerSynced {
324+
informerSynced := []cache.InformerSynced{
325+
sc.pdbInformer.Informer().HasSynced,
326+
sc.podInformer.Informer().HasSynced,
327+
sc.podGroupInformer.Informer().HasSynced,
328+
sc.nodeInformer.Informer().HasSynced,
329+
sc.pvInformer.Informer().HasSynced,
330+
sc.pvcInformer.Informer().HasSynced,
331+
sc.scInformer.Informer().HasSynced,
332+
sc.queueInformer.Informer().HasSynced,
333+
}
334+
if options.ServerOpts.EnablePriorityClass {
335+
informerSynced = append(informerSynced, sc.pcInformer.Informer().HasSynced)
336+
}
337+
return informerSynced
338+
}()...,
328339
)
329340
}
330341

0 commit comments

Comments
 (0)