Merge pull request #19758 from Huawei-PaaS/node-affinity-part1

NodeSelector, HardNodeAffinity and SoftNodeAffinity implementation
This commit is contained in:
David Oppenheimer
2016-02-03 19:18:45 -08:00
20 changed files with 33502 additions and 28298 deletions

View File

@@ -0,0 +1,28 @@
apiVersion: v1
kind: Pod
metadata:
name: with-labels
annotations:
scheduler.alpha.kubernetes.io/affinity: >
{
"nodeAffinity": {
"requiredDuringSchedulingIgnoredDuringExecution": {
"nodeSelectorTerms": [
{
"matchExpressions": [
{
"key": "kubernetes.io/e2e-az-name",
"operator": "In",
"values": ["e2e-az1", "e2e-az2"]
}
]
}
]
}
}
}
another-annotation-key: another-annotation-value
spec:
containers:
- name: with-labels
image: gcr.io/google_containers/pause:2.0