From a916f1b28ce794d000695235855a4db0a4e433e0 Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Tue, 26 Feb 2019 13:06:52 +0800 Subject: [PATCH] Remove redundant checker whether pod has claims in func FindPodVolumes --- .../volume/persistentvolume/scheduler_binder.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/pkg/controller/volume/persistentvolume/scheduler_binder.go b/pkg/controller/volume/persistentvolume/scheduler_binder.go index 20c7af62ad..f72f9171d9 100644 --- a/pkg/controller/volume/persistentvolume/scheduler_binder.go +++ b/pkg/controller/volume/persistentvolume/scheduler_binder.go @@ -139,15 +139,6 @@ func (b *volumeBinder) GetBindingsCache() PodBindingCache { return b.podBindingCache } -func podHasClaims(pod *v1.Pod) bool { - for _, vol := range pod.Spec.Volumes { - if vol.PersistentVolumeClaim != nil { - return true - } - } - return false -} - // FindPodVolumes caches the matching PVs and PVCs to provision per node in podBindingCache. // This method intentionally takes in a *v1.Node object instead of using volumebinder.nodeInformer. // That's necessary because some operations will need to pass in to the predicate fake node objects. @@ -168,11 +159,6 @@ func (b *volumeBinder) FindPodVolumes(pod *v1.Pod, node *v1.Node) (unboundVolume } }() - if !podHasClaims(pod) { - // Fast path - return unboundVolumesSatisfied, boundVolumesSatisfied, nil - } - var ( matchedClaims []*bindingInfo provisionedClaims []*v1.PersistentVolumeClaim