Merge pull request #26774 from xiangpengzhao/fix_predicatesnil

Automatic merge from submit-queue Check nil pointer in predicates.go Should check if the pointer is nil in func filterVolumes as is done in [func predicate](https://github.com/kubernetes/kubernetes/blob/master/plugin/pkg/scheduler/algorithm/predicates/predicates.go#L279).

Merge pull request #26774 from xiangpengzhao/fix_predicatesnil
61a9358d · k8s-merge-robot · GitHub · 1d9b6149 · 5b69688b · 61a9358d
Commit 61a9358d authored Jun 30, 2016 by k8s-merge-robot Committed by GitHub Jun 30, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 0 deletions

predicates.go plugin/pkg/scheduler/algorithm/predicates/predicates.go +8 -0

No files found.
--- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go
+++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go
@@ -169,6 +169,10 @@ func (c *MaxPDVolumeCountChecker) filterVolumes(volumes []api.Volume, namespace 
 				return nil
 			}

+			if pvc == nil {
+				return fmt.Errorf("PersistentVolumeClaim not found: %q", pvcName)
+			}
+
 			pvName := pvc.Spec.VolumeName
 			if pvName == "" {
 				return fmt.Errorf("PersistentVolumeClaim is not bound: %q", pvcName)
@@ -186,6 +190,10 @@ func (c *MaxPDVolumeCountChecker) filterVolumes(volumes []api.Volume, namespace 
 				return nil
 			}

+			if pv == nil {
+				return fmt.Errorf("PersistentVolume not found: %q", pvName)
+			}
+
 			if id, ok := c.filter.FilterPersistentVolume(pv); ok {
 				filteredVolumes[id] = true
 			}