fix: Make more robust way to backup/restore

Author: adskyiproger

charts/dependencies/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: opencrvs-dependencies-chart
 description: Dependencies required by OpenCRVS
 type: application
-version: 0.2.3
+version: 0.2.4
 appVersion: 1.9.0

charts/dependencies/templates/_helpers.tpl

@@ -9,22 +9,24 @@ Parameters:
 - .ServiceName: The name of the microservice, which is used to access service-specific values.
 - .Values: The top-level Values object for the Helm chart.
 */}}
+
 {{- define "render-env-vars" -}}
-  {{- $service_name := .service_name -}}
+  {{- $service_key_name := ( .service_name | replace "-" "_" ) }}
+
   {{/* Loop through and generate global environment variables */}}
   {{- range $k, $v := .Values.env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
-  {{- end -}}
+  {{- end }}
   {{/* Access the service-specific values using the service name */}}
-  {{- with index .Values $service_name -}}
+  {{- with index .Values $service_key_name }}
     {{/* Loop through and generate service-specific environment variables */}}
     {{- range $k, $v := .env }}
             - name: {{ $k }}
               value: {{ $v | quote }}
-    {{- end -}}
+    {{- end }}
     {{/* Loop through and generate secret references for service-specific secrets */}}
-    {{- range $secret_name, $secret_values := .secrets -}}
+    {{- range $secret_name, $secret_values := .secrets }}
       {{- range $secret_value := $secret_values }}
         {{- $secret := split ":" $secret_value }}
             - name: {{ $secret._1 | default $secret._0 }}

charts/dependencies/templates/influxdb-backup-cronjob.yaml

@@ -49,6 +49,7 @@ spec:
                       key: host
                 - name: BACKUP_REMOTE_DIR
                   value: "{{ .Values.influxdb.backup_server_dir | default .Values.backup.backup_server_dir }}"
+              {{- include "render-env-vars" (dict "service_name" "backup" "Values" .Values) | nindent 4 }}
               command: ["/scripts/backup.sh"]
               volumeMounts:
                 - name: backup-ssh-key

charts/dependencies/templates/influxdb-restore-cronjob.yaml

@@ -49,6 +49,7 @@ spec:
                       key: host
                 - name: BACKUP_REMOTE_DIR
                   value: "{{ .Values.influxdb.restore_server_dir | default .Values.restore.backup_server_dir }}"
+              {{- include "render-env-vars" (dict "service_name" "restore" "Values" .Values) | nindent 4 }}
               command: ["/scripts/restore.sh"]
               volumeMounts:
                 - name: backup-ssh-key

charts/dependencies/templates/minio-backup-cronjob.yaml

@@ -60,6 +60,7 @@ spec:
                       key: host
                 - name: BACKUP_REMOTE_DIR
                   value: "{{ .Values.minio.backup_server_dir | default .Values.backup.backup_server_dir }}"
+              {{- include "render-env-vars" (dict "service_name" "backup" "Values" .Values) | nindent 4 }}
               volumeMounts:
                 - name: backup-ssh-key
                   mountPath: /ssh

charts/dependencies/templates/minio-restore-cronjob.yaml

@@ -31,8 +31,6 @@ spec:
               env:
                 - name: RESTORE_MODE
                   value: "mirror"
-                - name: RESTORE_DATE
-                  value: {{ .Values.restore.date }}
               {{- if not .Values.minio.use_default_credentials }}
                 - name: MINIO_ROOT_USER
                   valueFrom:
@@ -62,6 +60,7 @@ spec:
                       key: host
                 - name: BACKUP_REMOTE_DIR
                   value: "{{ .Values.minio.backup_server_dir | default .Values.restore.backup_server_dir }}"
+              {{- include "render-env-vars" (dict "service_name" "restore" "Values" .Values) | nindent 4 }}
               volumeMounts:
                 - name: backup-ssh-key
                   mountPath: /ssh

charts/dependencies/templates/mongo-backup-cronjob.yaml

@@ -59,6 +59,7 @@ spec:
                       key: host
                 - name: BACKUP_REMOTE_DIR
                   value: "{{ .Values.mongodb.backup_server_dir | default .Values.backup.backup_server_dir }}"
+              {{- include "render-env-vars" (dict "service_name" "restore" "Values" .Values) | nindent 4 }}
               command: ["/scripts/backup.sh"]
               volumeMounts:
                 - name: backup-ssh-key

charts/dependencies/templates/mongo-restore-cronjob.yaml

@@ -59,6 +59,7 @@ spec:
                       key: host
                 - name: BACKUP_REMOTE_DIR
                   value: "{{ .Values.mongodb.restore_server_dir | default .Values.restore.backup_server_dir }}"
+              {{- include "render-env-vars" (dict "service_name" "restore" "Values" .Values) | nindent 4 }}
               command: ["/scripts/restore.sh"]
               volumeMounts:
                 - name: backup-ssh-key

charts/dependencies/templates/postgres-backup-cronjob.yaml

@@ -66,6 +66,7 @@ spec:
                       key: host
                 - name: BACKUP_REMOTE_DIR
                   value: "{{ .Values.postgres.backup_server_dir | default .Values.backup.backup_server_dir }}"
+              {{- include "render-env-vars" (dict "service_name" "backup" "Values" .Values) | nindent 4 }}
               command: ["/scripts/backup.sh"]
               volumeMounts:
                 - name: backup-ssh-key

charts/dependencies/templates/postgres-restore-cronjob.yaml

@@ -66,6 +66,7 @@ spec:
                       key: host
                 - name: BACKUP_REMOTE_DIR
                   value: "{{ .Values.postgres.restore_server_dir | default .Values.restore.backup_server_dir }}"
+              {{- include "render-env-vars" (dict "service_name" "restore" "Values" .Values) | nindent 4 }}
               command: ["/scripts/restore.sh"]
               volumeMounts:
                 - name: backup-ssh-key