Edit Helm Chart

deployment/templates/flower/flower-deployment.yaml

@@ -19,3 +19,4 @@ spec:
         command: ['flower']
         args: ['--broker=amqp://guest:guest@rabbitmq:5672//', '--port=5555', '--basic_auth={{ .Values.flower.basicAuth }}']
         name: flower
+        resources: {{- toYaml .Values.flower.resources | nindent 10 }}

deployment/templates/mongodb/mongodb-deployment.yaml

@@ -64,9 +64,7 @@ spec:
             periodSeconds: 10
             successThreshold: 1
             timeoutSeconds: 1
-          resources:
-            limits:
-              memory: 512Mi
+          resources: {{- toYaml .Values.mongodb.resources | nindent 10 }}
           volumeMounts:
             - mountPath: /var/lib/mongodb/data
               name: mongodb-data

deployment/templates/mongodb/mongodb-pvc.yaml

@@ -4,7 +4,7 @@ metadata:
   name: {{ .Values.mongodb.appName }}-volume
 spec:
   accessModes:
-    - ReadWriteMany
+    - {{ .Values.storageAccessMode }}
   resources:
     requests:
       storage: {{ .Values.mongodb.volumeSize }}

deployment/templates/prowes/celery-deployment.yaml

@@ -16,6 +16,13 @@ spec:
         image: busybox
         command: [ 'mkdir' ]
         args: [ '-p', '/data/db', '/data/output', '/data/tmp' ]
+        resources:
+          limits:
+            memory: 256Mi
+            cpu: 100m
+          requests:
+            memory: 256Mi
+            cpu: 100m
         volumeMounts:
         - mountPath: /data
           name: prowes-volume
@@ -50,13 +57,7 @@ spec:
           value: {{ .Values.rabbitmq.appName }}
         - name: RABBIT_PORT
           value: "5672"
-        resources:
-          requests:
-            memory: "512Mi"
-            cpu: "300m"
-          limits:
-            memory: "8Gi"
-            cpu: "1"
+        resources: {{- toYaml .Values.celeryWorker.resources | nindent 10 }}
         volumeMounts:
         - mountPath: /data
           name: prowes-volume

deployment/templates/prowes/prowes-deployment.yaml

@@ -12,11 +12,24 @@ spec:
       labels:
         app: {{ .Values.prowes.appName }}
     spec:
+      {{- if eq .Values.storageAccessMode "ReadWriteOnce" }}
+      affinity:
+        podAffinity:
+          requiredDuringSchedulingIgnoredDuringExecution:
+          - labelSelector:
+              matchExpressions:
+              - key: app
+                operator: In
+                values:
+                - {{ .Values.celeryWorker.appName }}
+            topologyKey: "kubernetes.io/hostname"
+      {{- end }}
       initContainers:
       - name: vol-init
         image: busybox
         command: [ 'mkdir' ]
         args: [ '-p', '/data/db', '/data/specs' ]
+        resources: {{- toYaml .Values.prowes.resources | nindent 10 }}
         volumeMounts:
         - mountPath: /data
           name: prowes-volume
@@ -51,6 +64,13 @@ spec:
           value: {{ .Values.rabbitmq.appName }}
         - name: RABBIT_PORT
           value: "5672"
+        resources:
+          limits:
+            cpu: 500m
+            memory: 256Mi
+          requests:
+            cpu: 100m
+            memory: 256Mi
         livenessProbe:
           tcpSocket:
             port: prowes-port

deployment/templates/prowes/prowes-volume.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ .Values.prowes.appName}}-volume
 spec:
   accessModes:
-    - ReadWriteMany
+    - {{ .Values.storageAccessMode }}
   resources:
     requests:
       storage: '1Gi'

deployment/templates/rabbitmq/rabbitmq-deployment.yaml

@@ -17,10 +17,11 @@ spec:
       containers:
       - name: rabbitmq
         image: {{ .Values.rabbitmq.image }}
+        resources: {{- toYaml .Values.rabbitmq.resources | nindent 10 }}
         volumeMounts:
         - mountPath: /var/lib/rabbitmq
           name: rabbitmq-volume
       volumes:
       - name: rabbitmq-volume
         persistentVolumeClaim:
-          claimName: {{ .Values.rabbitmq.appName }}-volume
+          claimName: {{ .Values.rabbitmq.appName }}-volume

deployment/templates/rabbitmq/rabbitmq-pvc.yaml

@@ -5,7 +5,7 @@ metadata:
   name: {{ .Values.rabbitmq.appName }}-volume
 spec:
   accessModes:
-    - ReadWriteMany
+    - {{ .Values.storageAccessMode }}
   resources:
     requests:
-      storage: {{ .Values.rabbitmq.volumeSize }}
+      storage: {{ .Values.rabbitmq.volumeSize }}

deployment/values.yaml

@@ -2,24 +2,47 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
-applicationDomain: rahtiapp.fi
+applicationDomain: ""
 
 # which cluster type proWES is going to be deployed on
 # it can be either 'kubernetes' or 'openshift'
 clusterType: kubernetes
 
+# mongodb-pvc.yaml/rabbitmq-pvc.yaml, change to ReadWriteMany if storageClass can do RWX
+storageAccessMode: ReadWriteOnce
+
 flower:
   appName: prowes-flower
   basicAuth: admin:admin
   image: endocode/flower
-
+  resources:
+    limits:
+      cpu: 500m
+      memory: 1Gi
+    requests:
+      cpu: 300m
+      memory: 500Mi
 prowes:
   appName: prowes
   image: elixircloud/prowes:latest
+  resources:
+    limits:
+      memory: 256Mi
+      cpu: 100m
+    requests:
+      memory: 256Mi
+      cpu: 100m
 
 celeryWorker:
   appName: celery-worker
   image: elixircloud/prowes:latest
+  resources:
+    limits:
+      cpu: 500m
+      memory: 256Mi
+    requests:
+      cpu: 100m
+      memory: 256Mi
 
 mongodb:
   appName: mongodb
@@ -29,8 +52,23 @@ mongodb:
   databaseUser: prowes-user
   volumeSize: 1Gi
   image: centos/mongodb-36-centos7
+  resources:
+    limits:
+      cpu: 500m
+      memory: 512Mi
+    requests:
+      cpu: 500m
+      memory: 512Mi
 
 rabbitmq:
   appName: rabbitmq
   volumeSize: 1Gi
   image: rabbitmq:3-management
+  resources:
+    limits:
+      cpu: 500m
+      memory: 1Gi
+    requests:
+      cpu: 500m
+      memory: 256Mi
+