Merge pull request #111 from SoftwareAG/dev-thr

MWS: `extraVolumeMounts` and `extraVolumes` implementation added

Author: thomas-2020

mywebmethodsserver/helm/README.md

@@ -49,7 +49,7 @@ helm install wm-mws mywebmethodsserver
 | `1.0.2` | `storage.enabled` added in `values.yaml`. For backward reason is this value set to `true` as default. `false` doesn't create and mount any PV. (You can test this feature if you don't want to deploy any own MWS application. MWS is more stateless and has only the database as stateful dependency.) |
 | `1.0.2` | `containerName` added in `values.yaml`. Default is the Chart name. (Use `helm repo update` to get latest Helm Chart version.) |
 | `1.0.3` | `tpl` function support in `affinity` value added. `topologySpreadConstraints` support added. |
-| `1.0.4` | `priorityClassName` support added. Implementation of `extraConfigMaps` added. |
+| `1.0.4` | `priorityClassName` support added. Implementation of `extraConfigMaps`, `extraVolumeMounts` and `extraVolumes` added. |
 
 ## Values
 

mywebmethodsserver/helm/README.md.gotmpl

@@ -49,6 +49,6 @@ helm install wm-mws mywebmethodsserver
 | `1.0.2` | `storage.enabled` added in `values.yaml`. For backward reason is this value set to `true` as default. `false` doesn't create and mount any PV. (You can test this feature if you don't want to deploy any own MWS application. MWS is more stateless and has only the database as stateful dependency.) |
 | `1.0.2` | `containerName` added in `values.yaml`. Default is the Chart name. (Use `helm repo update` to get latest Helm Chart version.) |
 | `1.0.3` | `tpl` function support in `affinity` value added. `topologySpreadConstraints` support added. |
-| `1.0.4` | `priorityClassName` support added. Implementation of `extraConfigMaps` added. |
+| `1.0.4` | `priorityClassName` support added. Implementation of `extraConfigMaps`, `extraVolumeMounts` and `extraVolumes` added. |
 
 {{ template "chart.valuesSection" . }}

mywebmethodsserver/helm/templates/statefulset.yaml

@@ -145,11 +145,26 @@ spec:
             mountPath: {{ get $value "path" }}
           {{- end }}
           {{- end }}
+          {{- if .Values.extraVolumeMounts }}
+          {{- if eq "string" (printf "%T" .Values.extraVolumeMounts) }}
+            {{- tpl .Values.extraVolumeMounts . | nindent 10 }}              
+          {{- else }}
+            {{- toYaml .Values.extraVolumeMounts | nindent 10 }}
+          {{- end }}      
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
-        {{ if .Values.extraContainers }}    
+        {{- if .Values.extraContainers }}    
         {{- toYaml .Values.extraContainers | nindent 8 }}
         {{- end }}
+      volumes:
+        {{- if .Values.extraVolumes }}
+        {{- if eq "string" (printf "%T" .Values.extraVolumes) }}
+          {{- tpl .Values.extraVolumes . | nindent 8 }}
+        {{- else }}
+          {{- toYaml .Values.extraVolumes | nindent 8 }}
+        {{- end }}
+        {{- end }}
       {{- with .Values.nodeSelector }}
       nodeSelector:
         {{- toYaml . | nindent 8 }}
@@ -169,13 +184,6 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
-      {{- if .Values.extraVolumeMounts }}
-      {{- if eq "string" (printf "%T" .Values.extraVolumeMounts) }}
-        {{- tpl .Values.extraVolumeMounts . | nindent 6 }}              
-      {{- else }}
-        {{- toYaml .Values.extraVolumeMounts | nindent 6 }}
-      {{- end }}      
-      {{- end }}
   volumeClaimTemplates:
     {{- if .Values.storage.enabled }}
     {{ $defaultVolumeNotMapped := true }}