Merge pull request #307 from Aste88/master

Fix #306 (extraVolumeMounts missing from deployment, wrong indent on extraInitContainers)
nextcloud · Feb 9, 2023 · d629055 · d629055
2 parents 6a8413c + 13b0607
commit d629055
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: nextcloud
-version: 3.4.5
+version: 3.4.6
 appVersion: 25.0.3
 description: A file sharing server that puts the control and security of your own data back into your hands.
 keywords:

diff --git a/charts/nextcloud/templates/_helpers.tpl b/charts/nextcloud/templates/_helpers.tpl
@@ -258,4 +258,7 @@ Create volume mounts for the nextcloud container as well as the cron sidecar con
   mountPath: {{ $nginxEnabled | ternary (printf "/usr/local/etc/php-fpm.d/%s" $key | quote) (printf "/usr/local/etc/php/conf.d/%s" $key | quote) }}
   subPath: {{ $key }}
 {{- end }}
+{{- if .Values.nextcloud.extraVolumeMounts }}
+{{ toYaml .Values.nextcloud.extraVolumeMounts }}
+{{- end -}}
 {{- end -}}
diff --git a/charts/nextcloud/templates/deployment.yaml b/charts/nextcloud/templates/deployment.yaml
@@ -252,7 +252,7 @@ spec:
       {{- if or .Values.nextcloud.extraInitContainers .Values.mariadb.enabled .Values.postgresql.enabled }}
       initContainers:
       {{- if .Values.nextcloud.extraInitContainers }}
-      {{- toYaml .Values.nextcloud.extraInitContainers | nindent 8 }}
+      {{- toYaml .Values.nextcloud.extraInitContainers | nindent 6 }}
       {{- end }}
       {{- if .Values.mariadb.enabled }}
       - name: mariadb-isalive