Share env variable NEXTCLOUD_DATA_DIR

Signed-off-by: Stephan Austermühle <[email protected]>
nextcloud · Mar 4, 2024 · 97f9875 · 97f9875
1 parent f8e3f58
commit 97f9875
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 9 deletions.
diff --git a/charts/nextcloud/README.md b/charts/nextcloud/README.md
@@ -528,9 +528,9 @@ Check out the [official Nextcloud backup docs](https://docs.nextcloud.com/server
 
 Configure `.nextcloud.backupCronjobs` to install Kubernetes Cronjobs
 to backup the Nextcloud data volume. The Helm chart automatically
-adds `volumes` and `volumeMounts` to the Cronjobs to make the
-Nextcloud data folder accessible at the same paths as the Nextcloud
-containers.
+shares the Nextcloud data folder to (`volumes`, `volumeMounts`) on the
+same path. Additionally, it provides the environment variable
+`NEXTCLOUD_DATA_DIR`.
 
 Example:
 
@@ -556,7 +556,7 @@ Example:
                   command:
                     - /bin/sh
                     - -c
-                    - "restic --quiet --json --host nextcloud-data --tag cron backup /var/www/html/data"
+                    - "restic --quiet --json --host nextcloud-data --tag cron backup ${NEXTCLOUD_DATA_DIR}"
                   env:
                     - name: RESTIC_CACHE_DIR
                       value: /run/restic/cache

diff --git a/charts/nextcloud/templates/_helpers.tpl b/charts/nextcloud/templates/_helpers.tpl
@@ -292,6 +292,11 @@ Create volume mounts for the nextcloud container as well as the cron sidecar con
 {{- end }}
 {{- end -}}
 
+{{- define "nextcloud.backupCronJobEnv" -}}
+- name: NEXTCLOUD_DATA_DIR
+  value: {{ .Values.nextcloud.datadir | quote }}
+{{- end -}}
+
 {{- define "nextcloud.backupCronJobVolumes" -}}
 {{- if and .Values.persistence.nextcloudData.enabled .Values.persistence.enabled }}
 - name: nextcloud-data

diff --git a/charts/nextcloud/templates/cronjobs.yaml b/charts/nextcloud/templates/cronjobs.yaml
@@ -16,12 +16,13 @@ spec:
     {{- $volumes := dict "spec" (dict "template" (dict "spec" (dict "volumes" $volumeList))) -}}
     {{- $jobTemplate := merge $volumes .jobTemplate -}}
 
-    {{/* Add the volumeMounts to every container */}}
+    {{/* Add the volumeMounts and environment variables to every container */}}
     {{- $containers := list -}}
     {{- range .jobTemplate.spec.template.spec.containers -}}
-    {{-   $vm := concat (default list .volumeMounts) (include "nextcloud.backupCronJobVolumeMounts" $ | fromYamlArray) -}}
-    {{-   $this := dict "volumeMounts" $vm -}}
-    {{-   $containers = append $containers (merge $this .) -}}
+    {{-   $vm := dict "volumeMounts" (concat (default list .volumeMounts) (include "nextcloud.backupCronJobVolumeMounts" $ | fromYamlArray)) -}}
+    {{-   $containers = append $containers (merge $vm .) -}}
+    {{-   $env := concat (default list .env) (include "nextcloud.backupCronJobEnv" $ | fromYamlArray) -}}
+    {{-   $containers = append $containers (merge (dict "env" $env) .) -}}
     {{- end -}}
 
     {{- $newContainers := dict "spec" (dict "template" (dict "spec" (dict "containers" $containers))) -}}

diff --git a/charts/nextcloud/values.yaml b/charts/nextcloud/values.yaml
@@ -216,7 +216,7 @@ nextcloud:
   #                 command:
   #                   - /bin/sh
   #                   - -c
-  #                   - "restic --quiet --json --host nextcloud-data --tag cron backup /var/www/html/data"
+  #                   - "restic --quiet --json --host nextcloud-data --tag cron backup ${NEXTCLOUD_DATA_DIR}"
   #                 env:
   #                   - name: TZ
   #                     value: "Europe/Berlin"