Add pod anti-affinity options

Signed-off-by: Pato Arvizu <patoarvizu@gmail.com>

helm/templates/deployments.yaml

@@ -110,7 +110,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: notary
-    app.kubernetes.io/component: notaryserver
+    app.kubernetes.io/component: notary-server
   name: notary-server
 spec:
   replicas: {{ .Values.signer.replicas }}
@@ -121,8 +121,35 @@ spec:
     metadata:
       labels:
         app.kubernetes.io/name: notary
-        app.kubernetes.io/component: notaryserver
+        app.kubernetes.io/component: notary-server
     spec:
+      {{- if .Values.affinity.enabled }}
+      affinity:
+        {{- if eq .Values.affinity.mode "pod-anti" }}
+        podAntiAffinity:
+          {{- if .Values.affinity.required }}
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - topologyKey: {{ .Values.affinity.topologyKey }}
+              labelSelector:
+                matchExpressions:
+                - key: app.kubernetes.io/component
+                  operator: In
+                  values:
+                  - notary-server
+          {{- else }}
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 1
+            podAffinityTerm:
+              topologyKey: {{ .Values.affinity.topologyKey }}
+              labelSelector:
+                matchExpressions:
+                - key: app.kubernetes.io/component
+                  operator: In
+                  values:
+                  - notary-server
+          {{- end }}
+        {{- end }}
+      {{- end }}
       initContainers:
       - command:
         - /gomplate
@@ -187,7 +214,7 @@ kind: Deployment
 metadata:
   labels:
     app.kubernetes.io/name: notary
-    app.kubernetes.io/component: notarysigner
+    app.kubernetes.io/component: notary-signer
   name: notary-signer
 spec:
   replicas: {{ .Values.signer.replicas }}
@@ -198,8 +225,35 @@ spec:
     metadata:
       labels:
         app.kubernetes.io/name: notary
-        app.kubernetes.io/component: notarysigner
+        app.kubernetes.io/component: notary-signer
     spec:
+      {{- if .Values.affinity.enabled }}
+      affinity:
+        {{- if eq .Values.affinity.mode "pod-anti" }}
+        podAntiAffinity:
+          {{- if .Values.affinity.required }}
+          requiredDuringSchedulingIgnoredDuringExecution:
+            - topologyKey: {{ .Values.affinity.topologyKey }}
+              labelSelector:
+                matchExpressions:
+                - key: app.kubernetes.io/component
+                  operator: In
+                  values:
+                  - notary-signer
+          {{- else }}
+          preferredDuringSchedulingIgnoredDuringExecution:
+          - weight: 1
+            podAffinityTerm:
+              topologyKey: {{ .Values.affinity.topologyKey }}
+              labelSelector:
+                matchExpressions:
+                - key: app.kubernetes.io/component
+                  operator: In
+                  values:
+                  - notary-signer
+          {{- end }}
+        {{- end }}
+      {{- end }}
       initContainers:
       - command:
         - /gomplate

helm/templates/jobs.yaml

@@ -5,7 +5,7 @@ metadata:
   name: notary-server-migrate
   labels:
     app.kubernetes.io/name: notary
-    app.kubernetes.io/component: notaryserver-migrate
+    app.kubernetes.io/component: notary-server-migrate
 spec:
   completions: 1
   parallelism: 1
@@ -14,7 +14,7 @@ spec:
     metadata:
         labels:
           app.kubernetes.io/name: notary
-          app.kubernetes.io/component: notaryserver-migrate
+          app.kubernetes.io/component: notary-server-migrate
     spec:
       initContainers:
       - command:
@@ -79,7 +79,7 @@ metadata:
   name: notary-signer-migrate
   labels:
     app.kubernetes.io/name: notary
-    app.kubernetes.io/component: notarysigner-migrate
+    app.kubernetes.io/component: notary-signer-migrate
 spec:
   completions: 1
   parallelism: 1
@@ -88,7 +88,7 @@ spec:
     metadata:
         labels:
           app.kubernetes.io/name: notary
-          app.kubernetes.io/component: notarysigner-migrate
+          app.kubernetes.io/component: notary-signer-migrate
     spec:
       initContainers:
       - command:

helm/templates/services.yaml

@@ -11,7 +11,7 @@ spec:
     targetPort: {{ .Values.signer.port }}
   selector:
     app.kubernetes.io/name: notary
-    app.kubernetes.io/component: notarysigner
+    app.kubernetes.io/component: notary-signer
 
 ---
 
@@ -28,7 +28,7 @@ spec:
     targetPort: {{ .Values.server.port }}
   selector:
     app.kubernetes.io/name: notary
-    app.kubernetes.io/component: notaryserver
+    app.kubernetes.io/component: notary-server
   {{- if .Values.loadBalancer.enabled }}
   type: LoadBalancer
   {{- if .Values.loadBalancer.loadBalancerIP }}

helm/values.yaml

@@ -231,4 +231,10 @@ caching:
 
   # These correspond to the options documented here (https://github.com/theupdateframework/notary/blob/master/docs/reference/server-config.md#caching-section-optional)
   currentMetadata: 300
-  consistentMetadata: 31536000
+  consistentMetadata: 31536000
+
+affinity:
+  enabled: true
+  mode: pod-anti
+  required: false
+  topologyKey: kubernetes.io/hostname