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

move labels to components which own the APIs

Browse Source
This commit is contained in:
deads2k
2017-05-30 10:46:00 -04:00
parent f0962765a7
commit 954eb3ceb9
69 changed files with 394 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/pkg/scheduler/algorithm/predicates/predicates.go
View File

@@ -36,6 +36,7 @@ import (
v1qos "k8s.io/kubernetes/pkg/api/v1/helper/qos"
corelisters "k8s.io/kubernetes/pkg/client/listers/core/v1"
"k8s.io/kubernetes/pkg/features"
kubeletapis "k8s.io/kubernetes/pkg/kubelet/apis"
volumeutil "k8s.io/kubernetes/pkg/volume/util"
"k8s.io/kubernetes/plugin/pkg/scheduler/algorithm"
priorityutil "k8s.io/kubernetes/plugin/pkg/scheduler/algorithm/priorities/util"
@@ -412,7 +413,7 @@ func (c *VolumeZoneChecker) predicate(pod *v1.Pod, meta interface{}, nodeInfo *s
nodeConstraints := make(map[string]string)
for k, v := range node.ObjectMeta.Labels {
if k != metav1.LabelZoneFailureDomain && k != metav1.LabelZoneRegion {
if k != kubeletapis.LabelZoneFailureDomain && k != kubeletapis.LabelZoneRegion {
continue
}
nodeConstraints[k] = v
@@ -458,7 +459,7 @@ func (c *VolumeZoneChecker) predicate(pod *v1.Pod, meta interface{}, nodeInfo *s
}
for k, v := range pv.ObjectMeta.Labels {
if k != metav1.LabelZoneFailureDomain && k != metav1.LabelZoneRegion {
if k != kubeletapis.LabelZoneFailureDomain && k != kubeletapis.LabelZoneRegion {
continue
}
nodeV, _ := nodeConstraints[k]