github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 05:27:21 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #74568 from hex108/pv

Browse Source 
Remove redundant checker whether pod has claims in func FindPodVolumes
This commit is contained in:
Kubernetes Prow Robot 2019-03-21 22:50:31 -07:00 committed by GitHub
commit 8ef336c05a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkg/controller/volume/persistentvolume/scheduler_binder.go
View File

@ -139,15 +139,6 @@ func (b *volumeBinder) GetBindingsCache() PodBindingCache {
return b.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. // 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. // 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. // 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 ( var (
matchedClaims []*bindingInfo matchedClaims []*bindingInfo
provisionedClaims []*v1.PersistentVolumeClaim provisionedClaims []*v1.PersistentVolumeClaim