From da375757eaed5f606347e7d58d2c14b5759a29c7 Mon Sep 17 00:00:00 2001 From: Jim Martens Date: Sun, 4 Feb 2024 23:07:48 +0100 Subject: [PATCH] feat(template): Add ability to configure volumes --- helm/template/Chart.yaml | 6 +++--- helm/template/_values.yaml | 8 +++++++- helm/template/templates/_deployment.yaml | 6 ++++-- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/helm/template/Chart.yaml b/helm/template/Chart.yaml index 5914499..7ac6647 100644 --- a/helm/template/Chart.yaml +++ b/helm/template/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v2 name: template description: A Helm library chart containing common templates, keeping application templates short type: library -version: 0.4.1 +version: 0.5.0 maintainers: - name: Jim Martens url: https://2martens.de @@ -10,8 +10,8 @@ sources: - https://github.com/2martens/cloud-configuration annotations: artifacthub.io/changes: | - - kind: fixed - description: Provide volume for tmp directory + - kind: added + description: Add ability to configure volumes/volume mounts artifacthub.io/signKey: | fingerprint: F0F153B65BAD467201D7544E47393ABD1F96B7C8 url: https://mafiasi.de/pks/key/47393ABD1F96B7C8.asc diff --git a/helm/template/_values.yaml b/helm/template/_values.yaml index e32a401..963f76e 100644 --- a/helm/template/_values.yaml +++ b/helm/template/_values.yaml @@ -166,7 +166,13 @@ tolerations: [] # Configure affinity, contents will be added verbatim to key affinity in deployment pod template affinity: {} +# volumes: configure volumes +volumes: [] + +# volumeMounts: will be mounted in container +volumeMounts: [] + # podSpec: will be added at the bottom of the pod template in the deployment podSpec: {} # containerSpec: will be added at the bottom of the container specification in the pod template -containerSpec: {} +containerSpec: {} \ No newline at end of file diff --git a/helm/template/templates/_deployment.yaml b/helm/template/templates/_deployment.yaml index df11c5b..d82b630 100644 --- a/helm/template/templates/_deployment.yaml +++ b/helm/template/templates/_deployment.yaml @@ -58,11 +58,12 @@ spec: - name: {{ .name }} value: {{ tpl (quote .value) $ }} {{- end }} - {{- if .Values.application.isSpring }} volumeMounts: + {{- if .Values.application.isSpring }} - mountPath: /tmp name: tmp {{- end }} + {{- toYaml .Values.volumeMounts | nindent 12 }} ports: - name: http containerPort: {{ .Values.application.port }} @@ -116,12 +117,13 @@ spec: tolerations: {{- toYaml . | nindent 8 }} {{- end }} - {{- if .Values.application.isSpring }} volumes: + {{- if .Values.application.isSpring }} - name: tmp emptyDir: medium: Memory {{- end }} + {{- toYaml .Values.volumes | nindent 8 }} {{- with .Values.podSpec }} {{- toYaml . | nindent 6 }} {{- end }}