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

storageclass can be in annotation and spec

Browse Source
This commit is contained in:
wenlxie
2018-05-12 20:59:12 +08:00
parent feeee50363
commit 38106e7f0b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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