Merge pull request #263 from devtron-labs/backup_chart2.4

fix: Backup chart2.4
devtron-labs · Feb 11, 2025 · dae23e3 · dae23e3
2 parents cbb3d68 + dbc4887
commit dae23e3
Show file tree

Hide file tree

Showing 6 changed files with 115 additions and 80 deletions.
diff --git a/charts/devtron-backups/Chart.yaml b/charts/devtron-backups/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: "2.0"
 description: A Helm chart for Devtron Backups
 name: devtron-backups
-version: 0.2.4
+version: 0.2.5
diff --git a/charts/devtron-backups/templates/backup-on-azure.yaml b/charts/devtron-backups/templates/backup-on-azure.yaml
@@ -25,20 +25,23 @@ kind: CronJob
 metadata:
   name: postgres-app-backup-cronjob
   namespace: devtroncd
-  {{- if $.Values.postgres_backup.labels }}
-  labels:
-{{ toYaml .Values.postgres_backup.labels | indent 4 }}
-  {{- end }}
-  {{- if $.Values.postgres_backup.annotations }}
-  annotations:
-{{ toYaml .Values.postgres_backup.annotations | indent 4 }}
-  {{- end }}
 spec:
   timeZone: {{ .Values.global.timezone | default "UTC" }}
   schedule: {{ .Values.global.schedule }}
   jobTemplate:
     spec:
       template:
+        {{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
+        metadata:
+          {{- if $.Values.postgres_backup.labels }}
+          labels:
+          {{ toYaml .Values.postgres_backup.labels | indent 4 }}
+          {{- end }}
+          {{- if $.Values.postgres_backup.annotations }}
+          annotations:
+          {{ toYaml .Values.postgres_backup.annotations | indent 4 }}
+          {{- end }}
+        {{- end }}  
         spec:
           initContainers:
           - name: postgres-app-backup-cronjob
@@ -58,7 +61,7 @@ spec:
             - -c
             - set -ex ; pg_dumpall -h {{ .Values.postgres_backup.host | default "postgresql-postgresql.devtroncd" }} --exclude-database=clairv4 -p 5432 -U postgres --no-privileges > /postgres/backup.tar; echo $? ; du -sh /postgres/backup.tar 
             resources:
-{{ toYaml .Values.postgres_backup.resources | indent 12 }}
+{{ toYaml .Values.postgres_backup.resources | indent 14 }}
           containers:
           - name: az-cli-for-upload
             image: {{ .Values.global.AZURE.image | default "quay.io/devtron/k8s-utils:az-cli-ubuntu" }}
@@ -81,14 +84,16 @@ spec:
                 secretKeyRef:
                   name: devtron-azure-backup-secret
                   key: AZURE_BLOB_CONTAINER_FOR_POSTGRES
+            {{- if .Values.argocd_backup.enabled }}
             - name: AZURE_BLOB_CONTAINER_FOR_ARGOCD
               valueFrom:
                 secretKeyRef:
                   name: devtron-azure-backup-secret
                   key: AZURE_BLOB_CONTAINER_FOR_ARGOCD
+            {{- end }}
             imagePullPolicy: Always
             resources:
-{{ toYaml .Values.postgres_backup.resources | indent 12 }}
+{{ toYaml .Values.postgres_backup.resources | indent 14 }}
             args:
             - /bin/bash
             - -c
@@ -121,20 +126,23 @@ kind: CronJob
 metadata:
   name: argocd-app-backup-cronjob
   namespace: devtroncd
-  {{- if $.Values.argocd_backup.labels }}
-  labels:
-{{ toYaml .Values.argocd_backup.labels | indent 4 }}
-  {{- end }}
-  {{- if $.Values.argocd_backup.annotations }}
-  annotations:
-{{ toYaml .Values.argocd_backup.annotations | indent 4 }}
-  {{- end }}
 spec:
   timeZone: {{ .Values.global.timezone | default "UTC" }}
   schedule: {{ .Values.global.schedule }}
   jobTemplate:
     spec:
       template:
+        {{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
+        metadata:
+          {{- if $.Values.postgres_backup.labels }}
+          labels:
+          {{ toYaml .Values.postgres_backup.labels | indent 4 }}
+          {{- end }}
+          {{- if $.Values.postgres_backup.annotations }}
+          annotations:
+          {{ toYaml .Values.postgres_backup.annotations | indent 4 }}
+          {{- end }}
+        {{- end }}
         spec:
           initContainers:
           - name: argocd-app-backup-job
@@ -149,7 +157,7 @@ spec:
             - -c
             - {{ .Values.argocd_backup.args | default "argocd admin export -n devtroncd > /argocd/backup.yaml" }}
             resources:
-{{ toYaml .Values.argocd_backup.resources | indent 12 }}
+{{ toYaml .Values.argocd_backup.resources | indent 14 }}
           containers:
           - name: az-cli-for-upload
             image: {{ .Values.global.AZURE.image  | default "quay.io/devtron/k8s-utils:az-cli-ubuntu"  }}
@@ -179,7 +187,7 @@ spec:
                   key: AZURE_BLOB_CONTAINER_FOR_ARGOCD
             imagePullPolicy: Always
             resources:
-{{ toYaml .Values.argocd_backup.resources | indent 12 }}
+{{ toYaml .Values.argocd_backup.resources | indent 14 }}
             args:
             - /bin/bash
             - -c

diff --git a/charts/devtron-backups/templates/backup-on-gcp.yaml b/charts/devtron-backups/templates/backup-on-gcp.yaml
@@ -23,20 +23,23 @@ kind: CronJob
 metadata:
   name: postgres-app-backup-cronjob
   namespace: devtroncd
-  {{- if $.Values.postgres_backup.labels }}
-  labels:
-{{ toYaml .Values.postgres_backup.labels | indent 4 }}
-  {{- end }}
-  {{- if $.Values.postgres_backup.annotations }}
-  annotations:
-{{ toYaml .Values.postgres_backup.annotations | indent 4 }}
-  {{- end }}
 spec:
   timeZone: {{ .Values.global.timezone | default "UTC" }}
   schedule: "{{ .Values.global.schedule }}"
   jobTemplate:
     spec:
       template:
+        {{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
+        metadata:
+          {{- if $.Values.postgres_backup.labels }}
+          labels:
+          {{ toYaml .Values.postgres_backup.labels | indent 4 }}
+          {{- end }}
+          {{- if $.Values.postgres_backup.annotations }}
+          annotations:
+          {{ toYaml .Values.postgres_backup.annotations | indent 4 }}
+          {{- end }}
+        {{- end }}
         spec:
           initContainers:
           - name: postgres-app-backup-cronjob
@@ -56,7 +59,7 @@ spec:
             - -c
             - set -ex; pg_dumpall -h {{ .Values.postgres_backup.host | default "postgresql-postgresql.devtroncd" }} --exclude-database=clairv4 -p 5432 -U postgres --no-privileges > /postgres/backup.tar; echo $? ; du -sh /postgres/backup.tar
             resources:
-{{ toYaml .Values.postgres_backup.resources | indent 12 }}
+{{ toYaml .Values.postgres_backup.resources | indent 14 }}
           containers:
           - name: gcloud-cli-for-cloud-storage-upload
             image: {{ .Values.global.GCP.image | default "google/cloud-sdk:alpine" }}
@@ -78,7 +81,7 @@ spec:
             {{- end }}
             imagePullPolicy: Always
             resources:
-{{ toYaml .Values.postgres_backup.resources | indent 12 }}
+{{ toYaml .Values.postgres_backup.resources | indent 14 }}
             args:
             - /bin/bash
             - -c
@@ -112,20 +115,23 @@ kind: CronJob
 metadata:
     name: argocd-app-backup-cronjob
     namespace: devtroncd
-    {{- if $.Values.argocd_backup.labels }}
-    labels:
-  {{ toYaml .Values.argocd_backup.labels | indent 4 }}
-    {{- end }}
-    {{- if $.Values.argocd_backup.annotations }}
-    annotations:
-  {{ toYaml .Values.argocd_backup.annotations | indent 4 }}
-    {{- end }}
 spec:
   timeZone: {{ .Values.global.timezone | default "UTC" }}
   schedule: "{{ .Values.global.schedule }}"
   jobTemplate:
     spec:
       template:
+        {{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
+        metadata:
+          {{- if $.Values.postgres_backup.labels }}
+          labels:
+          {{ toYaml .Values.postgres_backup.labels | indent 4 }}
+          {{- end }}
+          {{- if $.Values.postgres_backup.annotations }}
+          annotations:
+          {{ toYaml .Values.postgres_backup.annotations | indent 4 }}
+          {{- end }}
+        {{- end }}
         spec:
           initContainers:
           - name: argocd-app-backup-job
@@ -140,7 +146,7 @@ spec:
             - -c
             - {{ .Values.argocd_backup.args | default "argocd admin export -n devtroncd > /argocd/backup.yaml" }}
             resources:
-{{ toYaml .Values.argocd_backup.resources | indent 12 }}
+{{ toYaml .Values.argocd_backup.resources | indent 14 }}
           containers:
           - name: gcloud-cli-for-cloud-storage-upload
             image:  {{ .Values.global.GCP.image | default "google/cloud-sdk:alpine" }}
@@ -162,7 +168,7 @@ spec:
             {{- end }}
             imagePullPolicy: Always
             resources:
-{{ toYaml .Values.argocd_backup.resources | indent 12 }}
+{{ toYaml .Values.argocd_backup.resources | indent 14 }}
             args:
             - /bin/bash
             - -c

diff --git a/charts/devtron-backups/templates/backup-on-pvc.yaml b/charts/devtron-backups/templates/backup-on-pvc.yaml
@@ -9,20 +9,23 @@ kind: CronJob
 metadata:
     name: postgres-app-backup-cronjob
     namespace: devtroncd
-    {{- if $.Values.postgres_backup.labels }}
-    labels:
-{{ toYaml .Values.postgres_backup.labels | indent 6 }}
-    {{- end }}
-    {{- if $.Values.postgres_backup.annotations }}
-    annotations:
-{{ toYaml .Values.postgres_backup.annotations | indent 6 }}
-    {{- end }}
 spec:
     timeZone: {{ .Values.global.timezone | default "UTC" }}
     schedule: {{ .Values.global.schedule }}
     jobTemplate:
       spec:
         template:
+          {{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
+          metadata:
+            {{- if $.Values.postgres_backup.labels }}
+            labels:
+            {{ toYaml .Values.postgres_backup.labels | indent 4 }}
+            {{- end }}
+            {{- if $.Values.postgres_backup.annotations }}
+            annotations:
+            {{ toYaml .Values.postgres_backup.annotations | indent 4 }}
+            {{- end }}
+          {{- end }}
           spec:
             containers:
             - name: postgres-app-backup-cronjob
@@ -93,20 +96,23 @@ kind: CronJob
 metadata:
     name: argocd-app-backup-job
     namespace: devtroncd
-    {{- if $.Values.argocd_backup.labels }}
-    labels:
-{{ toYaml .Values.argocd_backup.labels | indent 6 }}
-    {{- end }}
-    {{- if $.Values.argocd_backup.annotations }}
-    annotations:
-{{ toYaml .Values.argocd_backup.annotations | indent 6 }}
-    {{- end }}
 spec:
     timeZone: {{ .Values.global.timezone | default "UTC" }}
     schedule: {{ .Values.global.schedule }}
     jobTemplate:
       spec:
         template:
+          {{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
+          metadata:
+            {{- if $.Values.postgres_backup.labels }}
+            labels:
+            {{ toYaml .Values.postgres_backup.labels | indent 4 }}
+            {{- end }}
+            {{- if $.Values.postgres_backup.annotations }}
+            annotations:
+            {{ toYaml .Values.postgres_backup.annotations | indent 4 }}
+            {{- end }}
+          {{- end }}
           spec:
             containers:
             - name: argocd-app-backup-job