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,43 +2,26 @@ apiVersion: v1
 kind: Pod
 metadata:
  name: with-pod-affinity
-  annotations:
-    scheduler.alpha.kubernetes.io/affinity: >
-        {
-          "podAffinity": {
-            "requiredDuringSchedulingIgnoredDuringExecution": [
-              {
-                "labelSelector": {
-                  "matchExpressions": [
-                    {
-                      "key": "security",
-                      "operator": "In",
-                      "values": ["S1"]
-                    }
-                  ]
-                },
-                "topologyKey": "failure-domain.beta.kubernetes.io/zone"
-             }
-            ]
-           },
-          "podAntiAffinity": {
-            "requiredDuringSchedulingIgnoredDuringExecution": [
-              {
-                "labelSelector": {
-                  "matchExpressions": [
-                    {
-                      "key": "security",
-                      "operator": "In",
-                      "values": ["S2"]
-                    }
-                  ]
-                },
-                "topologyKey": "kubernetes.io/hostname"
-             }
-            ]
-           }
-         }
 spec:
+  affinity:
+    podAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+      - labelSelector:
+          matchExpressions:
+          - key: security
+            operator: In
+            values:
+            - S1
+        topologyKey: failure-domain.beta.kubernetes.io/zone
+    podAntiAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+      - labelSelector:
+          matchExpressions:
+          - key: security
+            operator: In
+            values:
+            - S2
+        topologyKey: kubernetes.io/hostname
  containers:
  - name: with-pod-affinity
    image: gcr.io/google_containers/pause:2.0