From 56fcfc5feeac7e02912c2bcdac2b67c71b79e3c9 Mon Sep 17 00:00:00 2001 From: Wei Huang Date: Thu, 20 Sep 2018 00:13:50 -0700 Subject: [PATCH] cleanup duplicate assignment logic in scheduler --- pkg/scheduler/factory/factory.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkg/scheduler/factory/factory.go b/pkg/scheduler/factory/factory.go index 6efbe855f1..13d8f799b9 100644 --- a/pkg/scheduler/factory/factory.go +++ b/pkg/scheduler/factory/factory.go @@ -176,6 +176,7 @@ func NewConfigFactory(args *ConfigFactoryArgs) scheduler.Configurator { client: args.Client, podLister: schedulerCache, podQueue: core.NewSchedulingQueue(), + nodeLister: args.NodeInformer.Lister(), pVLister: args.PvInformer.Lister(), pVCLister: args.PvcInformer.Lister(), serviceLister: args.ServiceInformer.Lister(), @@ -255,7 +256,6 @@ func NewConfigFactory(args *ConfigFactoryArgs) scheduler.Configurator { DeleteFunc: c.deleteNodeFromCache, }, ) - c.nodeLister = args.NodeInformer.Lister() // On add and delete of PVs, it will affect equivalence cache items // related to persistent volume @@ -267,7 +267,6 @@ func NewConfigFactory(args *ConfigFactoryArgs) scheduler.Configurator { DeleteFunc: c.onPvDelete, }, ) - c.pVLister = args.PvInformer.Lister() // This is for MaxPDVolumeCountPredicate: add/delete PVC will affect counts of PV when it is bound. args.PvcInformer.Informer().AddEventHandler( @@ -277,7 +276,6 @@ func NewConfigFactory(args *ConfigFactoryArgs) scheduler.Configurator { DeleteFunc: c.onPvcDelete, }, ) - c.pVCLister = args.PvcInformer.Lister() // 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 @@ -289,7 +287,6 @@ func NewConfigFactory(args *ConfigFactoryArgs) scheduler.Configurator { DeleteFunc: c.onServiceDelete, }, ) - c.serviceLister = args.ServiceInformer.Lister() // Existing equivalence cache should not be affected by add/delete RC/Deployment etc, // it only make sense when pod is scheduled or deleted