Added custom redcap app rzstore image (curl) and updated docs

Author: kzgrzendek

charts/redcap/README.md

@@ -168,9 +168,6 @@ helm install redcap aphp-redcap/redcap -f ./examples/basic-install.yaml
 | restoreJob.imagePullSecrets | list | `[]` | ImagePullSecret used to pull the images for the restore pod's containers |
 | restoreJob.schedule | string | `"0 0 1 1 *"` | Schedule for the restore Cronjob. CronJob resources needs a valid schedule, but this one will never be used since it will always be suspended (see spec.suspend field). |
 | restoreJob.archiveName | string | `"redcap-backup.tar.gz"` | Name of the backup archive to restore. |
-| restoreJob.redcap.image.repository | string | `"busybox"` | Image repository for the REDCap application restore container. |
-| restoreJob.redcap.image.tag | string | `"1"` | Image tag for the REDCap application restore container. |
-| restoreJob.redcap.image.pullPolicy | string | `"Always"` | Image pullPolicy for the REDCap application restore container. |
 | restoreJob.downloader.image.repository | string | `"rclone/rclone"` | Image repository for the REDCap downloader container. |
 | restoreJob.downloader.image.tag | string | `"drime"` | Image tag for the REDCap downloader container. |
 | restoreJob.downloader.image.pullPolicy | string | `"Always"` | Image pullPolicy for the REDCap downloader container. |
@@ -181,6 +178,12 @@ helm install redcap aphp-redcap/redcap -f ./examples/basic-install.yaml
 | restoreJob.downloader.s3.config.auth.accessKeyID | string | `""` | AccessKeyID needed for authentication on the S3 bucket. |
 | restoreJob.downloader.s3.config.auth.secretAccessKey | string | `""` | SecretAccessKey needed for authentication on the S3 bucket. |
 | restoreJob.downloader.s3.config.auth.existingSecret | string | `""` | Reference to an existing secret holding the AccessKeyID and SecretAccessKey needed for authentication on the S3 bucket.    If set, overrides the AccessKeyID and SecretAccessKey values. |
+| restoreJob.file.image.repository | string | `"busybox"` | Image repository for the REDCap application restore container. |
+| restoreJob.file.image.tag | string | `"1"` | Image tag for the REDCap files application container. |
+| restoreJob.file.image.pullPolicy | string | `"Always"` | Image pullPolicy for the REDCap application restore container. |
+| restoreJob.redcap.image.repository | string | `"alpine/curl"` | Image repository for the REDCap application restore container. |
+| restoreJob.redcap.image.tag | string | `"8.12.1"` | Image tag for the REDCap application restore container. |
+| restoreJob.redcap.image.pullPolicy | string | `"Always"` | Image pullPolicy for the REDCap application restore container. |
 | restoreJob.resources | object | `{}` | Resources for backup job's pod. |
 
 ### REDCap Audit Log Shipper settings

charts/redcap/templates/cronjobs/restore-cronjob.yaml

@@ -73,8 +73,8 @@ spec:
               subPath: backup-download.sh
 
           - name: files-restore
-            image: "{{ .Values.restoreJob.redcap.image.repository }}:{{ .Values.restoreJob.redcap.image.tag }}"
-            imagePullPolicy: {{ .Values.restoreJob.redcap.image.pullPolicy }}
+            image: "{{ .Values.restoreJob.files.image.repository }}:{{ .Values.restoreJob.files.image.tag }}"
+            imagePullPolicy: {{ .Values.restoreJob.files.image.pullPolicy }}
             command: 
             - "sh"
             - "-c"
@@ -133,7 +133,7 @@ spec:
 
 
           containers:
-          - name: redcap-update
+          - name: redcap-restore
             image: "{{ .Values.restoreJob.redcap.image.repository }}:{{ .Values.restoreJob.redcap.image.tag }}"
             imagePullPolicy: {{ .Values.restoreJob.redcap.image.pullPolicy }}
             securityContext:

charts/redcap/values.yaml

@@ -448,37 +448,6 @@ restoreJob:
   # -- Name of the backup archive to restore.
   # @section -- REDCap Restore Job's settings
   archiveName: "redcap-backup.tar.gz"
-  redcap:
-    image:
-      # -- Image repository for the REDCap application restore container.
-      # @section -- REDCap Restore Job's settings
-      repository: "busybox"
-      # -- Image tag for the REDCap application restore container.
-      # @section -- REDCap Restore Job's settings
-      tag: "1"
-      # -- Image pullPolicy for the REDCap application restore container.
-      # @section -- REDCap Restore Job's settings
-      pullPolicy: "Always"
-
-  database:
-    image:
-      # # -- Image repository for the REDCap database restore container.
-      # # @section -- REDCap Restore Job's settings
-      # repository: "bitnamilegacy/MariaDB"
-      # # -- Image yag for the REDCap application restore container.
-      # # @section -- REDCap Restore Job's settings
-      # tag: "9.3.0-debian-12-r1"
-      # # -- Image pullPolicy for the REDCap application restore container.
-      # # @section -- REDCap Restore Job's settings
-      # pullPolicy: "Always"
-      ## @param image.registry MariaDB image registry
-      registry: docker.io
-      ## @param image.repository MariaDB image repository
-      repository: mariadb
-      ## @param image.tag MariaDB image tag (immutable tags are recommended)
-      tag: "12.1.2@sha256:e1bcd6f85781f4a875abefb11c4166c1d79e4237c23de597bf0df81fec225b40"
-      ## @param image.pullPolicy MariaDB image pull policy
-      imagePullPolicy: Always
 
   downloader:
     image:
@@ -519,6 +488,50 @@ restoreJob:
           # @section -- REDCap Restore Job's settings
           existingSecret: ""
 
+  file:
+    image:
+      # -- Image repository for the REDCap application restore container.
+      # @section -- REDCap Restore Job's settings
+      repository: "busybox"
+      # -- Image tag for the REDCap files application container.
+      # @section -- REDCap Restore Job's settings
+      tag: "1"
+      # -- Image pullPolicy for the REDCap application restore container.
+      # @section -- REDCap Restore Job's settings
+      pullPolicy: "Always"
+
+  database:
+    image:
+      # # -- Image repository for the REDCap database restore container.
+      # # @section -- REDCap Restore Job's settings
+      # repository: "bitnamilegacy/MariaDB"
+      # # -- Image yag for the REDCap application restore container.
+      # # @section -- REDCap Restore Job's settings
+      # tag: "9.3.0-debian-12-r1"
+      # # -- Image pullPolicy for the REDCap application restore container.
+      # # @section -- REDCap Restore Job's settings
+      # pullPolicy: "Always"
+      ## @param image.registry MariaDB image registry
+      registry: docker.io
+      ## @param image.repository MariaDB image repository
+      repository: mariadb
+      ## @param image.tag MariaDB image tag (immutable tags are recommended)
+      tag: "12.1.2@sha256:e1bcd6f85781f4a875abefb11c4166c1d79e4237c23de597bf0df81fec225b40"
+      ## @param image.pullPolicy MariaDB image pull policy
+      imagePullPolicy: Always
+
+  redcap:
+    image:
+      # -- Image repository for the REDCap application restore container.
+      # @section -- REDCap Restore Job's settings
+      repository: "alpine/curl"
+      # -- Image tag for the REDCap application restore container.
+      # @section -- REDCap Restore Job's settings
+      tag: "8.12.1"
+      # -- Image pullPolicy for the REDCap application restore container.
+      # @section -- REDCap Restore Job's settings
+      pullPolicy: "Always"
+
   # -- Resources for backup job's pod.
   # @section -- REDCap Restore Job's settings
   resources: {}