Skip to content

enhancement: updating Backup chart #336

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

enhancement: updating Backup chart #336

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
e988790
Modify backup job by adding PVC for backup
YashasviDevtron Sep 25, 2025
f70a1e9
Modify GCP backup job and adding PVC configuration
YashasviDevtron Sep 25, 2025
0d0ca23
Modify backup-on-pvc.yaml for job settings
YashasviDevtron Sep 25, 2025
b49d118
Modify S3 backup configuration and add PVC
YashasviDevtron Sep 25, 2025
6e62de8
Enhance postgres backup script with cleanup
YashasviDevtron Sep 25, 2025
d7f81de
Update serviceaccount.yaml
YashasviDevtron Sep 25, 2025
1237063
Update S3 settings and resource limits in values.yaml
YashasviDevtron Sep 25, 2025
442adb6
Bump version to 0.2.9 in Chart.yaml
YashasviDevtron Sep 25, 2025
c5e8a21
Update devtron-backups version to 0.2.9
YashasviDevtron Sep 25, 2025
7e9bcf5
Modify values.yaml for custom labels and backups
YashasviDevtron Sep 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/devtron-backups/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v2
appVersion: "2.0"
description: A Helm chart for Devtron Backups
name: devtron-backups
version: 0.2.8
version: 0.2.9
18 changes: 9 additions & 9 deletions charts/devtron-backups/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,29 @@
{{- if .Values.global.S3.CA_BUNDLE }}
{{- if .Values.global.S3.S3_ENDPOINT }}
{{- if .Values.global.S3.encryption.enabled }}
set -ex; date1=$(date +%Y%m%d-%H%M); path=$(pwd); echo "$CA_BUNDLE" > /cabundle.pem; export AWS_CA_BUNDLE=/cabundle.pem; gpg -c --batch --passphrase {{ .Values.global.S3.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; aws s3 cp /postgres/backup-$date1.tar.gpg s3://$S3_BUCKET/postgres/ --endpoint-url {{ .Values.global.S3.S3_ENDPOINT }} --ca-bundle $AWS_CA_BUNDLE;
set -ex; date1=$(date +%Y%m%d-%H%M); path=$(pwd); echo "$CA_BUNDLE" > /cabundle.pem; export AWS_CA_BUNDLE=/cabundle.pem; gpg -c --batch --passphrase {{ .Values.global.S3.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; aws s3 cp /postgres/backup-$date1.tar.gpg s3://$S3_BUCKET/postgres/ --endpoint-url {{ .Values.global.S3.S3_ENDPOINT }} --ca-bundle $AWS_CA_BUNDLE; rm -rvf /postgres/backup-$date1.tar.gpg;
{{- else }}
set -ex; date1=$(date +%Y%m%d-%H%M); path=$(pwd); echo "$CA_BUNDLE" > /cabundle.pem; export AWS_CA_BUNDLE=/cabundle.pem; mv /postgres/backup.tar /postgres/backup-$date1.tar; aws s3 cp /postgres/backup-$date1.tar s3://$S3_BUCKET/postgres/ --endpoint-url {{ .Values.global.S3.S3_ENDPOINT }} --ca-bundle $AWS_CA_BUNDLE;
set -ex; date1=$(date +%Y%m%d-%H%M); path=$(pwd); echo "$CA_BUNDLE" > /cabundle.pem; export AWS_CA_BUNDLE=/cabundle.pem; mv /postgres/backup.tar /postgres/backup-$date1.tar; aws s3 cp /postgres/backup-$date1.tar s3://$S3_BUCKET/postgres/ --endpoint-url {{ .Values.global.S3.S3_ENDPOINT }} --ca-bundle $AWS_CA_BUNDLE; rm -rvf /postgres/backup-$date1.tar.gpg;
{{- end }}
{{- else}}
{{- if .Values.global.S3.encryption.enabled }}
set -ex; date1=$(date +%Y%m%d-%H%M); path=$(pwd); echo "$CA_BUNDLE" > /cabundle.pem; export AWS_CA_BUNDLE=/cabundle.pem; gpg -c --batch --passphrase {{ .Values.global.S3.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; aws s3 cp /postgres/backup-$date1.tar.gpg s3://$S3_BUCKET/postgres/ ;
set -ex; date1=$(date +%Y%m%d-%H%M); path=$(pwd); echo "$CA_BUNDLE" > /cabundle.pem; export AWS_CA_BUNDLE=/cabundle.pem; gpg -c --batch --passphrase {{ .Values.global.S3.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; aws s3 cp /postgres/backup-$date1.tar.gpg s3://$S3_BUCKET/postgres/ ; rm -rvf /postgres/backup-$date1.tar.gpg;
{{- else}}
set -ex; date1=$(date +%Y%m%d-%H%M); path=$(pwd); echo "$CA_BUNDLE" > /cabundle.pem; export AWS_CA_BUNDLE=/cabundle.pem; mv /postgres/backup.tar /postgres/backup-$date1.tar; aws s3 cp /postgres/backup-$date1.tar s3://$S3_BUCKET/postgres/;
set -ex; date1=$(date +%Y%m%d-%H%M); path=$(pwd); echo "$CA_BUNDLE" > /cabundle.pem; export AWS_CA_BUNDLE=/cabundle.pem; mv /postgres/backup.tar /postgres/backup-$date1.tar; aws s3 cp /postgres/backup-$date1.tar s3://$S3_BUCKET/postgres/; rm -rvf /postgres/backup-$date1.tar.gpg;
{{- end }}
{{- end }}
{{- else }}
{{- if .Values.global.S3.S3_ENDPOINT }}
{{- if .Values.global.S3.encryption.enabled }}
set -ex; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.S3.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; aws s3 cp /postgres/backup-$date1.tar.gpg s3://$S3_BUCKET/postgres/ --endpoint-url {{ .Values.global.S3.S3_ENDPOINT }};
set -ex; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.S3.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; aws s3 cp /postgres/backup-$date1.tar.gpg s3://$S3_BUCKET/postgres/ --endpoint-url {{ .Values.global.S3.S3_ENDPOINT }}; rm -rvf /postgres/backup-$date1.tar.gpg;
{{- else}}
set -ex; date1=$(date +%Y%m%d-%H%M); mv /postgres/backup.tar /postgres/backup-$date1.tar; aws s3 cp /postgres/backup-$date1.tar s3://$S3_BUCKET/postgres/ --endpoint-url {{ .Values.global.S3.S3_ENDPOINT }};
set -ex; date1=$(date +%Y%m%d-%H%M); mv /postgres/backup.tar /postgres/backup-$date1.tar; aws s3 cp /postgres/backup-$date1.tar s3://$S3_BUCKET/postgres/ --endpoint-url {{ .Values.global.S3.S3_ENDPOINT }}; rm -rvf /postgres/backup-$date1.tar.gpg;
{{- end }}
{{- else}}
{{- if .Values.global.S3.encryption.enabled }}
set -ex; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.S3.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; aws s3 cp /postgres/backup-$date1.tar.gpg s3://$S3_BUCKET/postgres/;
set -ex; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.S3.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; aws s3 cp /postgres/backup-$date1.tar.gpg s3://$S3_BUCKET/postgres/; rm -rvf /postgres/backup-$date1.tar.gpg;
{{- else}}
set -ex; date1=$(date +%Y%m%d-%H%M); mv /postgres/backup.tar /postgres/backup-$date1.tar; aws s3 cp /postgres/backup-$date1.tar s3://$S3_BUCKET/postgres/;
set -ex; date1=$(date +%Y%m%d-%H%M); mv /postgres/backup.tar /postgres/backup-$date1.tar; aws s3 cp /postgres/backup-$date1.tar s3://$S3_BUCKET/postgres/; rm -rvf /postgres/backup-$date1.tar.gpg;
{{- end }}
{{- end }}
{{- end }}
Expand Down Expand Up @@ -60,4 +60,4 @@
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
44 changes: 30 additions & 14 deletions charts/devtron-backups/templates/backup-on-azure.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,6 @@ spec:
schedule: {{ .Values.global.schedule }}
jobTemplate:
spec:
backoffLimit: 0
{{- if $.Values.global.extraConfig }}
{{ toYaml $.Values.global.extraConfig | indent 6 }}
{{- end }}
template:
{{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
metadata:
Expand Down Expand Up @@ -102,13 +98,18 @@ spec:
- /bin/bash
- -c
{{- if $.Values.global.AZURE.encryption.enabled }}
- set -ex; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.AZURE.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; az storage blob upload --account-name $AZURE_BLOB_ACCOUNT_NAME --container-name $AZURE_BLOB_CONTAINER_FOR_POSTGRES --file /postgres/backup-$date1.tar.gpg --account-key $AZURE_ACCOUNT_KEY;
- set -ex; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.AZURE.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; az storage blob upload --account-name $AZURE_BLOB_ACCOUNT_NAME --container-name $AZURE_BLOB_CONTAINER_FOR_POSTGRES --file /postgres/backup-$date1.tar.gpg --account-key $AZURE_ACCOUNT_KEY; rm -rvf /postgres/backup-$date1.tar;
{{- else }}
- set -ex; date1=$(date +%Y%m%d-%H%M); mv /postgres/backup.tar /postgres/backup-$date1.tar; az storage blob upload --account-name $AZURE_BLOB_ACCOUNT_NAME --container-name $AZURE_BLOB_CONTAINER_FOR_POSTGRES --file /postgres/backup-$date1.tar --account-key $AZURE_ACCOUNT_KEY;
- set -ex; date1=$(date +%Y%m%d-%H%M); mv /postgres/backup.tar /postgres/backup-$date1.tar; az storage blob upload --account-name $AZURE_BLOB_ACCOUNT_NAME --container-name $AZURE_BLOB_CONTAINER_FOR_POSTGRES --file /postgres/backup-$date1.tar --account-key $AZURE_ACCOUNT_KEY; rm -rvf /postgres/backup-$date1.tar;
{{- end }}
volumes:
- name: psql-volume
emptyDir: {}
- name: psql-volume
persistentVolumeClaim:
{{- if and .Values.global.AZURE.PERSISTENCE.enabled .Values.global.AZURE.PERSISTENCE.existingClaim }}
claimName: {{ .Values.global.AZURE.PERSISTENCE.existingClaim }}
{{- else }}
claimName: devtron-backup-pvc
{{- end }}
{{- if $.Values.global.nodeSelector }}
nodeselector:
{{ toYaml .Values.global.nodeSelector | indent 12 }}
Expand All @@ -117,7 +118,7 @@ spec:
tolerations:
{{ toYaml .Values.global.tolerations | indent 12 }}
{{- end }}
restartPolicy: Never
restartPolicy: OnFailure
{{- end }}
---
{{- if .Values.argocd_backup.enabled }}
Expand All @@ -135,10 +136,6 @@ spec:
schedule: {{ .Values.global.schedule }}
jobTemplate:
spec:
backoffLimit: 0
{{- if $.Values.global.extraConfig }}
{{ toYaml $.Values.global.extraConfig | indent 6 }}
{{- end }}
template:
{{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
metadata:
Expand Down Expand Up @@ -215,7 +212,26 @@ spec:
tolerations:
{{ toYaml .Values.global.tolerations | indent 12 }}
{{- end }}
restartPolicy: Never
restartPolicy: OnFailure
serviceAccountName: {{ .Values.argocd_backup.serviceAccountName }}
{{- end }}
{{- end }}


{{- if and (.Values.global.AZURE.enabled) (.Values.global.AZURE.PERSISTENCE.enabled) (not .Values.global.AZURE.PERSISTENCE.existingClaim) }}
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: devtron-backup-pvc
namespace: devtroncd
spec:
{{- if .Values.global.AZURE.PERSISTENCE.storageClass }}
storageClassName: {{ .Values.global.AZURE.PERSISTENCE.storageClass }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.global.AZURE.PERSISTENCE.size }}
{{- end }}
47 changes: 31 additions & 16 deletions charts/devtron-backups/templates/backup-on-gcp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,6 @@ spec:
schedule: "{{ .Values.global.schedule }}"
jobTemplate:
spec:
backoffLimit: 0
{{- if $.Values.global.extraConfig }}
{{ toYaml $.Values.global.extraConfig | indent 6 }}
{{- end }}
template:
{{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
metadata:
Expand Down Expand Up @@ -90,22 +86,27 @@ spec:
- /bin/bash
- -c
{{- if $.Values.global.GCP.encryption.enabled }}
- set -ex; echo $gcp_credentials > /postgres/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/postgres/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.GCP.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; gsutil cp /postgres/backup-$date1.tar.gpg gs://$GCS_BUCKET/postgres/;
- set -ex; echo $gcp_credentials > /postgres/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/postgres/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.GCP.encryption.passphrase }} /postgres/backup.tar; rm -rvf /postgres/backup.tar; mv /postgres/backup.tar.gpg /postgres/backup-$date1.tar.gpg; gsutil cp /postgres/backup-$date1.tar.gpg gs://$GCS_BUCKET/postgres/; rm -rvf /postgres/backup-$date1.tar.gpg;
{{- else}}
- set -ex; echo $gcp_credentials > /postgres/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/postgres/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); mv /postgres/backup.tar /postgres/backup-$date1.tar; gsutil cp /postgres/backup-$date1.tar gs://$GCS_BUCKET/postgres/;
- set -ex; echo $gcp_credentials > /postgres/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/postgres/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); mv /postgres/backup.tar /postgres/backup-$date1.tar; gsutil cp /postgres/backup-$date1.tar gs://$GCS_BUCKET/postgres/; rm -rvf /postgres/backup-$date1.tar.gpg;
{{- end }}
volumes:
- name: psql-volume
emptyDir: {}
{{- if $.Values.global.nodeSelector }}
- name: psql-volume
persistentVolumeClaim:
{{- if and .Values.global.GCP.PERSISTENCE.enabled .Values.global.GCP.PERSISTENCE.existingClaim }}
claimName: {{ .Values.global.GCP.PERSISTENCE.existingClaim }}
{{- else }}
claimName: devtron-backup-pvc
{{- end }}
{{- if $.Values.global.nodeSelector }}
nodeselector:
{{ toYaml .Values.global.nodeSelector | indent 12 }}
{{- end }}
{{- if $.Values.global.tolerations }}
tolerations:
{{ toYaml .Values.global.tolerations | indent 12 }}
{{- end }}
restartPolicy: Never
restartPolicy: OnFailure
serviceAccountName: {{ .Values.postgres_backup.serviceAccountName | default "default" }}
{{- end }}
---
Expand All @@ -124,10 +125,6 @@ spec:
schedule: "{{ .Values.global.schedule }}"
jobTemplate:
spec:
backoffLimit: 0
{{- if $.Values.global.extraConfig }}
{{ toYaml $.Values.global.extraConfig | indent 6 }}
{{- end }}
template:
{{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
metadata:
Expand Down Expand Up @@ -196,7 +193,25 @@ spec:
tolerations:
{{ toYaml .Values.global.tolerations | indent 12 }}
{{- end }}
restartPolicy: Never
restartPolicy: OnFailure
serviceAccountName: {{ .Values.argocd_backup.serviceAccountName }}
{{- end }}
{{- end }}
{{- end }}

{{- if and (.Values.global.GCP.enabled) (.Values.global.GCP.PERSISTENCE.enabled) (not .Values.global.GCP.PERSISTENCE.existingClaim) }}
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: devtron-backup-pvc
namespace: devtroncd
spec:
{{- if .Values.global.GCP.PERSISTENCE.storageClass }}
storageClassName: {{ .Values.global.GCP.PERSISTENCE.storageClass }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.global.GCP.PERSISTENCE.size }}
{{- end }}
13 changes: 3 additions & 10 deletions charts/devtron-backups/templates/backup-on-pvc.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,6 @@ spec:
schedule: {{ .Values.global.schedule }}
jobTemplate:
spec:
{{- if $.Values.global.extraConfig }}
{{ toYaml $.Values.global.extraConfig | indent 6 }}
{{- end }}
template:
{{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
metadata:
Expand Down Expand Up @@ -49,7 +46,7 @@ spec:
{{- if $.Values.global.PERSISTENCE.encryption.enabled }}
- set -ex; mkdir -p /postgres/ ; date1=$(date +%Y%m%d-%H%M); pg_dumpall -h postgresql-postgresql.devtroncd -p 5432 -U postgres --no-privileges > /postgres/backup-$date1.tar ; gpg -c --batch --passphrase {{ .Values.global.PERSISTENCE.encryption.passphrase }} /postgres/backup-$date1.tar ; rm -rvf /postgres/backup-$date1.tar;
{{- else }}
- set -ex; mkdir -p /postgres/ ; date1=$(date +%Y%m%d-%H%M); pg_dumpall -h {{ .Values.postgres_backup.host | default "postgresql-postgresql.devtroncd" }} --exclude-database=clairv4 -p 5432 -U postgres --no-privileges > /postgres/backup-$date1.tar ;
- set -ex; mkdir -p /postgres/ ; date1=$(date +%Y%m%d-%H%M); pg_dumpall -h {{ .Values.postgres_backup.host | default "postgresql-postgresql.devtroncd" }} --exclude-database=clairv4 -p 5432 -U postgres --no-privileges > /postgres/backup-$date1.tar ; rm -rvf /postgres/backup-$date1.tar;
{{- end }}
resources:
{{ toYaml .Values.postgres_backup.resources | indent 12 }}
Expand All @@ -69,7 +66,7 @@ spec:
tolerations:
{{ toYaml .Values.global.tolerations | indent 12 }}
{{- end }}
restartPolicy: Never
restartPolicy: OnFailure
{{- end }}
{{- if and (.Values.global.PERSISTENCE.enabled) (not .Values.global.PERSISTENCE.existingClaim) }}
---
Expand Down Expand Up @@ -104,10 +101,6 @@ spec:
schedule: {{ .Values.global.schedule }}
jobTemplate:
spec:
backoffLimit: 0
{{- if $.Values.global.extraConfig }}
{{ toYaml $.Values.global.extraConfig | indent 6 }}
{{- end }}
template:
{{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
metadata:
Expand Down Expand Up @@ -155,7 +148,7 @@ spec:
tolerations:
{{ toYaml .Values.global.tolerations | indent 12 }}
{{- end }}
restartPolicy: Never
restartPolicy: OnFailure
serviceAccountName: argocd-backup
{{- end }}
{{- end }}
41 changes: 28 additions & 13 deletions charts/devtron-backups/templates/backup-on-s3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
type: Opaque
data:
S3_BUCKET_NAME: {{ .Values.global.S3.S3_BUCKET_NAME | b64enc }}
{{- if .Values.global.S3.S3_ACCESS_KEY }}
{{- if eq .Values.global.S3.NODE_ROLE "false" }}
AWS_ACCESS_KEY: {{ .Values.global.S3.S3_ACCESS_KEY | b64enc }}
AWS_SECRET_KEY: {{ .Values.global.S3.S3_SECRET_KEY | b64enc }}
{{- end }}
Expand All @@ -33,10 +33,6 @@ spec:
schedule: "{{ .Values.global.schedule }}"
jobTemplate:
spec:
backoffLimit: 0
{{- if $.Values.global.extraConfig }}
{{ toYaml $.Values.global.extraConfig | indent 6 }}
{{- end }}
template:
{{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
metadata:
Expand Down Expand Up @@ -115,7 +111,12 @@ spec:
{{ include "devtron.postgresBackup" . | indent 6 }}
volumes:
- name: psql-volume
emptyDir: {}
persistentVolumeClaim:
{{- if and .Values.global.S3.PERSISTENCE.enabled .Values.global.S3.PERSISTENCE.existingClaim }}
claimName: {{ .Values.global.S3.PERSISTENCE.existingClaim }}
{{- else }}
claimName: devtron-backup-pvc
{{- end }}
{{- if $.Values.global.nodeSelector }}
nodeselector:
{{ toYaml .Values.global.nodeSelector | indent 12 }}
Expand All @@ -124,7 +125,7 @@ spec:
tolerations:
{{ toYaml .Values.global.tolerations | indent 12 }}
{{- end }}
restartPolicy: Never
restartPolicy: OnFailure
{{- end }}
---
{{- if .Values.argocd_backup.enabled }}
Expand All @@ -142,10 +143,6 @@ spec:
schedule: "{{ .Values.global.schedule }}"
jobTemplate:
spec:
backoffLimit: 0
{{- if $.Values.global.extraConfig }}
{{ toYaml $.Values.global.extraConfig | indent 6 }}
{{- end }}
template:
{{- if or $.Values.postgres_backup.labels $.Values.postgres_backup.annotations }}
metadata:
Expand Down Expand Up @@ -227,7 +224,25 @@ spec:
tolerations:
{{ toYaml .Values.global.tolerations | indent 12 }}
{{- end }}
restartPolicy: Never
restartPolicy: OnFailure
serviceAccountName: {{ .Values.argocd_backup.serviceAccountName }}
{{- end }}
{{- end }}
{{- end }}

{{- if and (.Values.global.S3.enabled) (.Values.global.S3.PERSISTENCE.enabled) (not .Values.global.S3.PERSISTENCE.existingClaim) }}
---
apiVersion: v1
kind: PersistentVolumeClaim
metadata:
name: devtron-backup-pvc
namespace: devtroncd
spec:
{{- if .Values.global.S3.PERSISTENCE.storageClass }}
storageClassName: {{ .Values.global.S3.PERSISTENCE.storageClass }}
{{- end }}
accessModes:
- ReadWriteOnce
resources:
requests:
storage: {{ .Values.global.S3.PERSISTENCE.size }}
{{- end }}
2 changes: 1 addition & 1 deletion charts/devtron-backups/templates/serviceaccount.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,4 +48,4 @@ roleRef:
subjects:
- kind: ServiceAccount
name: {{ .Values.argocd_backup.serviceAccountName }}
{{- end }}
{{- end }}
Loading
Loading