added elasticsearch persistence

molgenis/templates/deployment.yaml

@@ -49,7 +49,7 @@ spec:
               value: "-Xmx{{ .javaOpts.maxHeapSpace }} -XX:+UseConcMarkSweepGC -XX:+CMSClassUnloadingEnabled"
           ports:
             - containerPort: 8080
-          {{- if .persistence.enabled }}
+          {{- if $.Values.persistence.enabled }}
           volumeMounts:
           - name: molgenis-nfs
             mountPath: /home/molgenis
@@ -92,15 +92,25 @@ spec:
           ports:
             - containerPort: 9200
             - containerPort: 9300
+          {{- if $.Values.persistence.enabled }}
+          volumeMounts:
+          - name: elastic-nfs
+            mountPath: /usr/share/elasticsearch/data
+          {{- end }}
+
           resources:
 {{ toYaml .resources | indent 12 }}
         {{- end }}
 
-{{- if .Values.molgenis.persistence.enabled }}
+{{- if .Values.persistence.enabled }}
       volumes:
         - name: molgenis-nfs
           persistentVolumeClaim:
-            claimName: {{ .Values.molgenis.persistence.name }}
+            claimName: {{ .Values.molgenis.persistence.claim }}
+      volumes:
+        - name: elasticsearch-nfs
+          persistentVolumeClaim:
+            claimName: {{ .Values.elasticsearch.persistence.claim }}
 {{- end }}
 
     {{- with .Values.nodeSelector }}

molgenis/templates/persistence/elasticsearchPVC.yaml

@@ -0,0 +1,20 @@
+{{- if .Values.persistence.enabled -}}
+apiVersion: extensions/v1beta1
+kind: PersistentVolumeClaim
+apiVersion: v1
+metadata:
+  name: {{ .Values.elasticsearch.persistence.claim }}
+  annotations:
+    {{- if .Values.persistence.retain }}
+    volume.beta.kubernetes.io/storage-class: "nfs-provisioner-retain"
+    {{- else }}
+    volume.beta.kubernetes.io/storage-class: "nfs-provisioner"
+    {{- end }}
+spec:
+  accessModes:
+    - ReadWriteMany
+  resources:
+    requests:
+      storage: {{ .Values.elasticsearch.persistence.size }}
+{{- end }}
+{{- end }}

molgenis/templates/persistence/molgenisPVC.yaml

@@ -1,12 +1,11 @@
-{{- with .Values.molgenis.persistence }}
-{{- if .enabled -}}
+{{- if .Values.persistence.enabled -}}
 apiVersion: extensions/v1beta1
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
-  name: {{ .name }}
+  name: {{ .Values.molgenis.persistence.claim }}
   annotations:
-    {{- if .retain }}
+    {{- if .Values.persistence.retain }}
     volume.beta.kubernetes.io/storage-class: "nfs-provisioner-retain"
     {{- else }}
     volume.beta.kubernetes.io/storage-class: "nfs-provisioner"
@@ -16,6 +15,6 @@ spec:
     - ReadWriteMany
   resources:
     requests:
-      storage: {{ .size }}
+      storage: {{ .Values.molgenis.persistence.size }}
 {{- end }}
 {{- end }}