github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #85899 from gongguan/slim_down_lister

Browse Source 
slim down some lister expansions
This commit is contained in:
Kubernetes Prow Robot
2019-12-09 07:20:17 -08:00
committed by GitHub
parent 398e2bcc73 7f5076d8ee
commit fcc35b0468
28 changed files with 419 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/scheduler/algorithm/predicates/predicates.go
View File

@@ -1003,7 +1003,7 @@ func (s *ServiceAffinity) serviceAffinityMetadataProducer(pm *predicateMetadata)
return
}
// Store services which match the pod.
matchingPodServices, err := s.serviceLister.GetPodServices(pm.pod)
matchingPodServices, err := schedulerlisters.GetPodServices(s.serviceLister, pm.pod)
if err != nil {
klog.Errorf("Error precomputing service affinity: could not list services: %v", err)
}

4
pkg/scheduler/algorithm/priorities/metadata.go
View File

@@ -105,7 +105,7 @@ func (pmf *MetadataFactory) PriorityMetadata(
// getFirstServiceSelector returns one selector of services the given pod.
func getFirstServiceSelector(pod *v1.Pod, sl corelisters.ServiceLister) (firstServiceSelector labels.Selector) {
if services, err := sl.GetPodServices(pod); err == nil && len(services) > 0 {
if services, err := schedulerlisters.GetPodServices(sl, pod); err == nil && len(services) > 0 {
return labels.SelectorFromSet(services[0].Spec.Selector)
}
return nil
@@ -117,7 +117,7 @@ func getSelector(pod *v1.Pod, sl corelisters.ServiceLister, cl corelisters.Repli
// Since services, RCs, RSs and SSs match the pod, they won't have conflicting
// labels. Merging is safe.
if services, err := sl.GetPodServices(pod); err == nil {
if services, err := schedulerlisters.GetPodServices(sl, pod); err == nil {
for _, service := range services {
labelSet = labels.Merge(labelSet, service.Spec.Selector)
}