Merge a2b509e into c98d4af

helm/reana/README.md

@@ -50,6 +50,7 @@ This Helm automatically prefixes all names using the release name to avoid colli
 | `notifications.system_status`                            | Cronjob pattern representing how often the system status notification should be sent. Leave it empty to deactivate it | "0 0 * * *"                                     |
 | `reana_url`                                              | REANA URL host                                                                       | None                                            |
 | `default_runtime_namespace`                              | Namespace in which the REANA runtime pods (workflow engines, jobs etc...) will run   | None                                            |
+| `dedicated_nodes`                                        | Should the infrastructure and runtime pods be splitted by node? (all nodes in the cluster should be labeled either as `reana-system=infrastructure` or `reana-system=runtime`)   | False |
 | `secrets.cern.sso.CERN_CONSUMER_KEY`                     | CERN SSO consumer key                                                                | None                                            |
 | `secrets.cern.sso.CERN_CONSUMER_SECRET`                  | **[Do not use in production, use secrets instead]** CERN SSO consumer secret         | None                                            |
 | `secrets.database.pasword`                               | **[Do not use in production, use secrets instead]** PostgreSQL database password     | None                                            |

helm/reana/templates/_helpers.tpl

@@ -27,3 +27,10 @@ naming spec: `my-reana-batch-yadage-3c640169-d3b7-41ad-9c09-392c903fc1d8`
 {{- define "reana.prefixed_runtime_svaccount_name" -}}
 {{- include "reana.prefix" . -}}-runtime
 {{- end -}}
+
+{{- define "reana_sytem_infrastructure_annotations" -}}
+{{- if .Values.dedicated_nodes }}
+  annotations:
+    scheduler.alpha.kubernetes.io/node-selector: reana-system=infrastructure
+{{- end }}
+{{- end -}}

helm/reana/templates/reana-cache.yaml

@@ -18,6 +18,7 @@ kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-cache
   namespace: {{ .Release.Namespace }}
+  {{- include "reana_sytem_infrastructure_annotations" . }}
 spec:
   replicas: 1
   selector:

helm/reana/templates/reana-db.yaml

@@ -19,6 +19,7 @@ kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-db
   namespace: {{ .Release.Namespace }}
+  {{- include "reana_sytem_infrastructure_annotations" . }}
 spec:
   replicas: 1
   selector:

helm/reana/templates/reana-mail.yaml

@@ -26,6 +26,7 @@ kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-mail
   namespace: {{ .Release.Namespace }}
+  {{- include "reana_sytem_infrastructure_annotations" . }}
 spec:
   replicas: 1
   selector:
@@ -38,7 +39,7 @@ spec:
     spec:
       containers:
       - name: maildev
-        image: maildev/maildev
+        image: maildev/maildev:1.1.0
         imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 80

helm/reana/templates/reana-message-broker.yaml

@@ -22,6 +22,7 @@ kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-message-broker
   namespace: {{ .Release.Namespace }}
+  {{- include "reana_sytem_infrastructure_annotations" . }}
 spec:
   replicas: 1
   selector:

helm/reana/templates/reana-server.yaml

@@ -19,6 +19,7 @@ kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-server
   namespace: {{ .Release.Namespace }}
+  {{- include "reana_sytem_infrastructure_annotations" . }}
 spec:
   replicas: 1
   selector:

helm/reana/templates/reana-ui.yaml

@@ -20,6 +20,7 @@ kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-ui
   namespace: {{ .Release.Namespace }}
+  {{- include "reana_sytem_infrastructure_annotations" . }}
 spec:
   replicas: 1
   selector:

helm/reana/templates/reana-wdb.yaml

@@ -25,6 +25,7 @@ kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-wdb
   namespace: {{ .Release.Namespace }}
+  {{- include "reana_sytem_infrastructure_annotations" . }}
 spec:
   replicas: 1
   selector:

helm/reana/templates/reana-workflow-controller.yaml

@@ -19,6 +19,7 @@ kind: Deployment
 metadata:
   name: {{ include "reana.prefix" . }}-workflow-controller
   namespace: {{ .Release.Namespace }}
+  {{- include "reana_sytem_infrastructure_annotations" . }}
 spec:
   replicas: 1
   selector:

helm/reana/templates/serviceaccount.yaml

@@ -10,8 +10,10 @@ apiVersion: v1
 kind: Namespace
 metadata:
   name: {{ .Values.default_runtime_namespace }}
+{{- if .Values.dedicated_nodes }}
   annotations:
     scheduler.alpha.kubernetes.io/node-selector: reana-system=runtime
+{{- end }}
 ---
 apiVersion: v1
 kind: ServiceAccount