From a2dac2fa56a760836bf6032488dfc9ef8d7aa2a7 Mon Sep 17 00:00:00 2001 From: Marcel Wunderlich Date: Thu, 22 Feb 2024 12:10:07 +0100 Subject: [PATCH] Fix subPath on datadir mounts (fixes #531) - subPath now does not necessarily end on /data, in particular empty subPath possible for datadir on specific PVC - datadir persistence now does not depend on overall persistence anymore - bump .minor because old installs will need to add `/data` back to the subPath in the values file Signed-off-by: Marcel Wunderlich --- charts/nextcloud/Chart.yaml | 2 +- charts/nextcloud/templates/_helpers.tpl | 8 +++++--- charts/nextcloud/templates/deployment.yaml | 8 +++++--- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/charts/nextcloud/Chart.yaml b/charts/nextcloud/Chart.yaml index 31f18390..a4a59bdf 100644 --- a/charts/nextcloud/Chart.yaml +++ b/charts/nextcloud/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: nextcloud -version: 4.6.2 +version: 4.7.0 appVersion: 28.0.2 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 index 8214e1ab..7e3047ef 100644 --- a/charts/nextcloud/templates/_helpers.tpl +++ b/charts/nextcloud/templates/_helpers.tpl @@ -246,11 +246,13 @@ Create volume mounts for the nextcloud container as well as the cron sidecar con - name: nextcloud-main mountPath: /var/www/html subPath: {{ ternary "html" (printf "%s/html" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }} -{{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }} +{{- if .Values.persistence.nextcloudData.enabled }} - name: nextcloud-data mountPath: {{ .Values.nextcloud.datadir }} - subPath: {{ ternary "data" (printf "%s/data" .Values.persistence.nextcloudData.subPath) (empty .Values.persistence.nextcloudData.subPath) }} -{{- else }} +{{- if not (empty .Values.persistence.nextcloudData.subPath) }} + subPath: {{ .Values.persistence.nextcloudData.subPath }} +{{- end }} +{{- else if .Values.persistence.enabled }} - name: nextcloud-main mountPath: {{ .Values.nextcloud.datadir }} subPath: {{ ternary "data" (printf "%s/data" .Values.persistence.subPath) (empty .Values.persistence.subPath) }} diff --git a/charts/nextcloud/templates/deployment.yaml b/charts/nextcloud/templates/deployment.yaml index be3aeea9..0b677260 100644 --- a/charts/nextcloud/templates/deployment.yaml +++ b/charts/nextcloud/templates/deployment.yaml @@ -215,11 +215,13 @@ spec: - name: nextcloud-main mountPath: /var/www/html subPath: {{ ternary "html" (printf "%s/html" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }} - {{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }} + {{- if .Values.persistence.nextcloudData.enabled }} - name: nextcloud-data mountPath: {{ .Values.nextcloud.datadir }} - subPath: {{ ternary "data" (printf "%s/data" .Values.persistence.nextcloudData.subPath) (empty .Values.persistence.nextcloudData.subPath) }} - {{- else }} + {{- if not (empty .Values.persistence.nextcloudData.subPath) }} + subPath: {{ .Values.persistence.nextcloudData.subPath }} + {{- end }} + {{- else if .Values.persistence.enabled }} - name: nextcloud-main mountPath: {{ .Values.nextcloud.datadir }} subPath: {{ ternary "data" (printf "%s/data" .Values.persistence.subPath) (empty .Values.persistence.subPath) }}