Merge pull request #63749 from wenlxie/githubupstream.master.minofixforgetstorageclass

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. minor fix for VolumeZoneChecker predicate storageclass can be in annotation and spec. ```release-note minor fix for VolumeZoneChecker predicate, storageclass can be in annotation and spec. ```

Merge pull request #63749 from wenlxie/githubupstream.master.minofixforgetstorageclass
9a15ee70 · Kubernetes Submit Queue · GitHub · a481f4bb · 38106e7f · 9a15ee70
Unverified Commit 9a15ee70 authored May 17, 2018 by Kubernetes Submit Queue Committed by GitHub May 17, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

predicates.go pkg/scheduler/algorithm/predicates/predicates.go +3 -3

No files found.
--- a/pkg/scheduler/algorithm/predicates/predicates.go
+++ b/pkg/scheduler/algorithm/predicates/predicates.go
@@ -592,9 +592,9 @@ func (c *VolumeZoneChecker) predicate(pod *v1.Pod, meta algorithm.PredicateMetad
 			pvName := pvc.Spec.VolumeName
 			if pvName == "" {
 				if utilfeature.DefaultFeatureGate.Enabled(features.VolumeScheduling) {
-					scName := pvc.Spec.StorageClassName
-					if scName != nil && len(*scName) > 0 {
-						class, _ := c.classInfo.GetStorageClassInfo(*scName)
+					scName := v1helper.GetPersistentVolumeClaimClass(pvc)
+					if len(scName) > 0 {
+						class, _ := c.classInfo.GetStorageClassInfo(scName)
 						if class != nil {
 							if class.VolumeBindingMode == nil {
 								return false, nil, fmt.Errorf("VolumeBindingMode not set for StorageClass %q", scName)