github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Simplify the volume util by v1helper.

Browse Source 
Signed-off-by: Da K. Ma <klaus1982.cn@gmail.com>
This commit is contained in:
Da K. Ma 2018-05-22 16:41:43 +08:00
parent a0036fcae1
commit 275a4bf91f
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/volume/util/util.go
View File

@ -278,18 +278,11 @@ func checkVolumeNodeAffinity(pv *v1.PersistentVolume, nodeLabels map[string]stri
if pv.Spec.NodeAffinity.Required != nil { if pv.Spec.NodeAffinity.Required != nil {
terms := pv.Spec.NodeAffinity.Required.NodeSelectorTerms terms := pv.Spec.NodeAffinity.Required.NodeSelectorTerms
glog.V(10).Infof("Match for Required node selector terms %+v", terms) glog.V(10).Infof("Match for Required node selector terms %+v", terms)
for _, term := range terms { if !v1helper.MatchNodeSelectorTerms(terms, labels.Set(nodeLabels), nil) {
selector, err := v1helper.NodeSelectorRequirementsAsSelector(term.MatchExpressions) return fmt.Errorf("No matching NodeSelectorTerms")
if err != nil {
return fmt.Errorf("Failed to parse MatchExpressions: %v", err)
}
if selector.Matches(labels.Set(nodeLabels)) {
// Terms are ORed, so only one needs to match
return nil
}
} }
return fmt.Errorf("No matching NodeSelectorTerms")
} }
return nil return nil
} }