Added volumes and volume mounts variables to be able to use wordforms.txt and stopwords.txt

Author: Floris Groenendijk

charts/manticoresearch/templates/manticore-balancer.yaml

@@ -92,6 +92,13 @@ spec:
           - name: config-volume
             mountPath: {{ .Values.balancer.config.path }}
             subPath: manticore.conf
+          {{- range .Values.balancer.volumeMounts }}
+          - name: {{ .name }}
+            mountPath: {{ .mountPath }}
+            {{- if .subPath }}
+            subPath: {{ .subPath }}
+            {{- end}}
+          {{- end }}
         resources:
           {{- toYaml .Values.balancer.resources | nindent 10 }}
       {{- if or .Values.exporter.enabled .Values.serviceMonitor.enabled }}
@@ -120,6 +127,11 @@ spec:
         - name: config-volume
           configMap:
             name: {{ include "manticoresearch.fullname" . }}-balancer-config
+        {{- range .Values.balancer.volumes }}
+        - name: {{ .name }}
+          configMap:
+            name: {{ .configMap.name }}
+        {{- end }}
       {{- with .Values.balancer.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/manticoresearch/templates/manticore-worker.yaml

@@ -104,6 +104,13 @@ spec:
           - name: config-volume
             mountPath: {{ .Values.worker.config.path }}
             subPath: manticore.conf
+          {{- range .Values.worker.volumeMounts }}
+          - name: {{ .name }}
+            mountPath: {{ .mountPath }}
+            {{- if .subPath }}
+            subPath: {{ .subPath }}
+            {{- end}}
+          {{- end }}
         resources:
           {{- toYaml .Values.worker.resources | nindent 10 }}
       {{- if or .Values.exporter.enabled .Values.serviceMonitor.enabled }}
@@ -132,6 +139,11 @@ spec:
         - name: config-volume
           configMap:
             name: {{ include "manticoresearch.fullname" . }}-worker-config
+        {{- range .Values.worker.volumes }}
+        - name: {{ .name }}
+          configMap:
+            name: {{ .configMap.name }}
+        {{- end }}
       {{- with .Values.worker.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}

charts/manticoresearch/values.yaml

@@ -47,6 +47,7 @@ balancer:
         shutdown_timeout = 25s
         auto_optimize = 0
       }
+  volumeMounts: []
   resources: {}
     # We usually recommend not to specify default resources and to leave this as a conscious
     # choice for the user. This also increases chances charts run on environments with little
@@ -124,13 +125,15 @@ worker:
         listen = $hostname:9315-9415:replication
         node_address = $hostname
         binlog_path = /var/lib/manticore
+        log = /dev/stdout
         query_log = /dev/stdout
         query_log_format = sphinxql
         pid_file = /var/run/manticore/searchd.pid
         data_dir = /var/lib/manticore
         shutdown_timeout = 25s
         auto_optimize = 0
       }
+  volumeMounts: []
   resources: {}
   # See comment on balancer.resources
   nodeSelector: {}