github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-05 15:37:24 +00:00
Code Issues Projects Releases Wiki Activity

renaming labels.LabelSelector to labels.internalSelector

Browse Source
This commit is contained in:
Salvatore Dario Minonne
2015-12-03 09:04:55 +01:00
parent b7d8221296
commit 3288ce0dcb
3 changed files with 92 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/apis/extensions/helpers.go
View File

@@ -18,7 +18,6 @@ package extensions
import (
"fmt"
"sort"
"k8s.io/kubernetes/pkg/api"
"k8s.io/kubernetes/pkg/labels"
@@ -34,13 +33,13 @@ func PodSelectorAsSelector(ps *PodSelector) (labels.Selector, error) {
if len(ps.MatchLabels)+len(ps.MatchExpressions) == 0 {
return labels.Everything(), nil
}
selector := labels.LabelSelector{}
selector := labels.NewSelector()
for k, v := range ps.MatchLabels {
req, err := labels.NewRequirement(k, labels.InOperator, sets.NewString(v))
r, err := labels.NewRequirement(k, labels.InOperator, sets.NewString(v))
if err != nil {
return nil, err
}
selector = append(selector, *req)
selector = selector.Add(*r)
}
for _, expr := range ps.MatchExpressions {
var op labels.Operator
@@ -56,13 +55,12 @@ func PodSelectorAsSelector(ps *PodSelector) (labels.Selector, error) {
default:
return nil, fmt.Errorf("%q is not a valid pod selector operator", expr.Operator)
}
req, err := labels.NewRequirement(expr.Key, op, sets.NewString(expr.Values...))
r, err := labels.NewRequirement(expr.Key, op, sets.NewString(expr.Values...))
if err != nil {
return nil, err
}
selector = append(selector, *req)
selector = selector.Add(*r)
}
sort.Sort(labels.ByKey(selector))
return selector, nil
}