Merge pull request #64139 from k82cn/vol_util_enhance

Automatic merge from submit-queue (batch tested with PRs 64013, 63896, 64139, 57527, 62102). 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>. Simplify the volume util by v1helper. Signed-off-by: Da K. Ma <klaus1982.cn@gmail.com> **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes # **Release note**: ```release-note None ```

Merge pull request #64139 from k82cn/vol_util_enhance
be599a62 · Kubernetes Submit Queue · GitHub · 10377f65 · 275a4bf9 · be599a62
Unverified Commit be599a62 authored May 23, 2018 by Kubernetes Submit Queue Committed by GitHub May 23, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 10 deletions

util.go pkg/volume/util/util.go +3 -10

No files found.
--- a/pkg/volume/util/util.go
+++ b/pkg/volume/util/util.go
@@ -278,18 +278,11 @@ func checkVolumeNodeAffinity(pv *v1.PersistentVolume, nodeLabels map[string]stri
 	if pv.Spec.NodeAffinity.Required != nil {
 		terms := pv.Spec.NodeAffinity.Required.NodeSelectorTerms
 		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
 }