feat: add useImageCode flag to skip /var/www and /var/www/html volume mounts

Author: rizlas

charts/nextcloud/templates/_helpers.tpl

@@ -368,12 +368,14 @@ Swift as primary object store env vars
 Create volume mounts for the nextcloud container as well as the cron sidecar container.
 */}}
 {{- define "nextcloud.volumeMounts" -}}
+{{- if not .Values.nextcloud.persistence.useImageCode }}
 - name: nextcloud-main
   mountPath: /var/www/
   subPath: {{ ternary "root" (printf "%s/root" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
 - name: nextcloud-main
   mountPath: /var/www/html
   subPath: {{ ternary "html" (printf "%s/html" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
+{{- end }}
 {{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }}
 - name: nextcloud-data
   mountPath: {{ .Values.nextcloud.datadir }}

charts/nextcloud/templates/deployment.yaml

@@ -207,12 +207,14 @@ spec:
             {{- toYaml . | nindent 12 }}
           {{- end }}
           volumeMounts:
+            {{- if not .Values.nextcloud.persistence.useImageCode }}
             - name: nextcloud-main
               mountPath: /var/www/
               subPath: {{ ternary "root" (printf "%s/root" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
             - name: nextcloud-main
               mountPath: /var/www/html
               subPath: {{ ternary "html" (printf "%s/html" .Values.nextcloud.persistence.subPath) (empty .Values.nextcloud.persistence.subPath) }}
+            {{- end }}
             {{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }}
             - name: nextcloud-data
               mountPath: {{ .Values.nextcloud.datadir }}

charts/nextcloud/values.yaml

@@ -141,6 +141,10 @@ nextcloud:
   datadir: /var/www/html/data
   persistence:
     subPath:
+    # Set to true when using an image with code baked in (no VOLUME /var/www/html).
+    # Skips the /var/www/ and /var/www/html mounts so the image code is not masked
+    # by the PVC. Only granular mounts (config, custom_apps, themes, tmp) are kept.
+    useImageCode: false
   # if set, we'll template this list to the NEXTCLOUD_TRUSTED_DOMAINS env var
   trustedDomains: []
   ## SMTP configuration