Update "node selection" documentation to reflect Beta affinity syntax

2017-03-04 04:15:51 +00:00
parent d83ea64d98
commit 855cc67c77
3 changed files with 52 additions and 70 deletions
@@ -2,27 +2,25 @@ apiVersion: v1
 kind: Pod
 metadata:
  name: with-node-affinity
-  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:
+  affinity:
+    nodeAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+        nodeSelectorTerms:
+        - matchExpressions:
+          - key: kubernetes.io/e2e-az-name
+            operator: In
+            values:
+            - e2e-az1
+            - e2e-az2
+      preferredDuringSchedulingIgnoredDuringExecution:
+      - weight: 1
+        preference:
+          matchExpressions:
+          - key: another-node-label-key
+            operator: In
+            values:
+            - another-node-label-value
  containers:
  - name: with-node-affinity
-    image: gcr.io/google_containers/pause:2.0
+    image: gcr.io/google_containers/pause:2.0