Merge "Use k8s 1.6 syntax of declaring affinity"

ceph/templates/statefulset-mon.yaml

@@ -29,27 +29,21 @@ spec:
       labels:
         app: ceph
         daemon: mon
-      annotations:
-        # alanmeadows: this soft requirement allows single
-        # host deployments to spawn several ceph-mon
-        # containers
-        scheduler.alpha.kubernetes.io/affinity: >
-          {
-            "podAntiAffinity": {
-              "preferredDuringSchedulingIgnoredDuringExecution": [{
-                "labelSelector": {
-                  "matchExpressions": [{
-                    "key": "daemon",
-                    "operator": "In",
-                    "values":["mon"]
-                  }]
-                },
-              "topologyKey": "kubernetes.io/hostname",
-              "weight": 10
-              }]
-            }
-          }
     spec:
+      # alanmeadows: this soft requirement allows single
+      # host deployments to spawn several ceph-mon
+      # containers
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values: ["mon"]
+              topologyKey: kubernetes.io/hostname
+            weight: 10
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       serviceAccount: default

doc/source/devref/getting-started/labels.rst

@@ -84,24 +84,19 @@ single host environment:
 
 ::
 
-          annotations:
+      # alanmeadows: this soft requirement allows single
-            # this soft requirement allows single
+      # host deployments to spawn several mariadb containers
-            # host deployments to spawn several mariadb containers
+      # but in a larger environment, would attempt to spread
-            # but in a larger environment, would attempt to spread
+      # them out
-            # them out
+      affinity:
-            scheduler.alpha.kubernetes.io/affinity: >
+        podAntiAffinity:
-              {
+          preferredDuringSchedulingIgnoredDuringExecution:
-                "podAntiAffinity": {
+          - podAffinityTerm:
-                  "preferredDuringSchedulingIgnoredDuringExecution": [{
+              labelSelector:
-                    "labelSelector": {
+                matchExpressions:
-                      "matchExpressions": [{
+                - key: app
-                        "key": "app",
+                  operator: In
-                        "operator": "In",
+                  values: ["mariadb"]
-                        "values":["mariadb"]
+              topologyKey: kubernetes.io/hostname
-                      }]
+            weight: 10
-                    },
+
-                  "topologyKey": "kubernetes.io/hostname",
-                  "weight": 10
-                  }]
-                }
-              }

mariadb/templates/statefulset.yaml

@@ -25,28 +25,22 @@ spec:
       labels:
         app: {{ .Values.service_name }}
         galera: enabled
-      annotations:
-        # alanmeadows: this soft requirement allows single
-        # host deployments to spawn several mariadb containers
-        # but in a larger environment, would attempt to spread
-        # them out
-        scheduler.alpha.kubernetes.io/affinity: >
-          {
-            "podAntiAffinity": {
-              "preferredDuringSchedulingIgnoredDuringExecution": [{
-                "labelSelector": {
-                  "matchExpressions": [{
-                    "key": "app",
-                    "operator": "In",
-                    "values":["mariadb"]
-                  }]
-                },
-              "topologyKey": "kubernetes.io/hostname",
-              "weight": 10
-              }]
-            }
-          }
     spec:
+      # alanmeadows: this soft requirement allows single
+      # host deployments to spawn several mariadb containers
+      # but in a larger environment, would attempt to spread
+      # them out
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values: ["mariadb"]
+              topologyKey: kubernetes.io/hostname
+            weight: 10
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       containers:

rabbitmq/templates/deployment.yaml

@@ -35,24 +35,19 @@ spec:
       annotations:
         configmap-bin-hash: {{ tuple "configmap-bin.yaml" . | include "helm-toolkit.utils.hash" }}
         configmap-etc-hash: {{ tuple "configmap-etc.yaml" . | include "helm-toolkit.utils.hash" }}
-        # TODO: this needs to be moved to common.
-        scheduler.alpha.kubernetes.io/affinity: >
-           {
-             "podAntiAffinity": {
-               "preferredDuringSchedulingIgnoredDuringExecution": [{
-                 "labelSelector": {
-                   "matchExpressions": [{
-                     "key": "app",
-                     "operator": "In",
-                     "values":["rabbitmq"]
-                   }]
-                 },
-               "topologyKey": "kubernetes.io/hostname",
-               "weight": 10
-               }]
-             }
-           }
     spec:
+      # TODO: this needs to be moved to common.
+      affinity:
+        podAntiAffinity:
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - podAffinityTerm:
+              labelSelector:
+                matchExpressions:
+                - key: app
+                  operator: In
+                  values: ["rabbitmq"]
+              topologyKey: kubernetes.io/hostname
+            weight: 10
       nodeSelector:
         {{ .Values.labels.node_selector_key }}: {{ .Values.labels.node_selector_value }}
       volumes: