github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #68875 from Huang-Wei/minor-scheduler-cleanup

Browse Source 
cleanup duplicate assignment logic in scheduler
This commit is contained in:
k8s-ci-robot 2018-09-27 18:29:39 -07:00 committed by GitHub
commit c79ad5a65b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/scheduler/factory/factory.go
View File

@ -176,6 +176,7 @@ func NewConfigFactory(args *ConfigFactoryArgs) scheduler.Configurator {
client: args.Client, client: args.Client,
podLister: schedulerCache, podLister: schedulerCache,
podQueue: core.NewSchedulingQueue(), podQueue: core.NewSchedulingQueue(),
nodeLister: args.NodeInformer.Lister(),
pVLister: args.PvInformer.Lister(), pVLister: args.PvInformer.Lister(),
pVCLister: args.PvcInformer.Lister(), pVCLister: args.PvcInformer.Lister(),
serviceLister: args.ServiceInformer.Lister(), serviceLister: args.ServiceInformer.Lister(),
@ -255,7 +256,6 @@ func NewConfigFactory(args *ConfigFactoryArgs) scheduler.Configurator {
DeleteFunc: c.deleteNodeFromCache, DeleteFunc: c.deleteNodeFromCache,
}, },
) )
c.nodeLister = args.NodeInformer.Lister()
// On add and delete of PVs, it will affect equivalence cache items // On add and delete of PVs, it will affect equivalence cache items
// related to persistent volume // related to persistent volume
@ -267,7 +267,6 @@ func NewConfigFactory(args *ConfigFactoryArgs) scheduler.Configurator {
DeleteFunc: c.onPvDelete, DeleteFunc: c.onPvDelete,
}, },
) )
c.pVLister = args.PvInformer.Lister()
// This is for MaxPDVolumeCountPredicate: add/delete PVC will affect counts of PV when it is bound. // This is for MaxPDVolumeCountPredicate: add/delete PVC will affect counts of PV when it is bound.
args.PvcInformer.Informer().AddEventHandler( args.PvcInformer.Informer().AddEventHandler(
@ -277,7 +276,6 @@ func NewConfigFactory(args *ConfigFactoryArgs) scheduler.Configurator {
DeleteFunc: c.onPvcDelete, DeleteFunc: c.onPvcDelete,
}, },
) )
c.pVCLister = args.PvcInformer.Lister()
// This is for ServiceAffinity: affected by the selector of the service is updated. // This is for ServiceAffinity: affected by the selector of the service is updated.
// Also, if new service is added, equivalence cache will also become invalid since // Also, if new service is added, equivalence cache will also become invalid since
@ -289,7 +287,6 @@ func NewConfigFactory(args *ConfigFactoryArgs) scheduler.Configurator {
DeleteFunc: c.onServiceDelete, DeleteFunc: c.onServiceDelete,
}, },
) )
c.serviceLister = args.ServiceInformer.Lister()
// Existing equivalence cache should not be affected by add/delete RC/Deployment etc, // Existing equivalence cache should not be affected by add/delete RC/Deployment etc,
// it only make sense when pod is scheduled or deleted // it only make sense when pod is scheduled or deleted