Merge pull request #222 from devtron-labs/backup-chart-fixes

fix: Backup chart fixes

Author: kirandevtn

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.0
+version: 0.2.1

charts/devtron-backups/templates/backup-on-gcp.yaml

@@ -70,9 +70,9 @@ spec:
             - /bin/bash
             - -c
           {{- if $.Values.global.GCP.encryption.enabled }}          
-            - echo $gcp_credentials > /tmp/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/tmp/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.GCP.encryption.passphrase }} /tmp/backup.tar; rm -rvf /tmp/backup.tar; mv /tmp/backup.tar.gpg /tmp/backup-$date1.tar.gpg; gcloud storage cp /tmp/backup-$date1.tar.gpg gs://$GCS_BUCKET/postgres/;
+            - echo $gcp_credentials > /tmp/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/tmp/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.GCP.encryption.passphrase }} /tmp/backup.tar; rm -rvf /tmp/backup.tar; mv /tmp/backup.tar.gpg /tmp/backup-$date1.tar.gpg; gsutil cp /tmp/backup-$date1.tar.gpg gs://$GCS_BUCKET/postgres/;
           {{- else}}
-            - echo $gcp_credentials > /tmp/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/tmp/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); mv /tmp/backup.tar /tmp/backup-$date1.tar; gcloud storage cp /tmp/backup-$date1.tar gs://$GCS_BUCKET/postgres/;
+            - echo $gcp_credentials > /tmp/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/tmp/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); mv /tmp/backup.tar /tmp/backup-$date1.tar; gsutil cp /tmp/backup-$date1.tar gs://$GCS_BUCKET/postgres/;
           {{- end }}
           volumes:
           - name: psql-volume
@@ -133,14 +133,14 @@ spec:
             - /bin/bash
             - -c
           {{- if $.Values.global.GCP.encryption.enabled }}
-            - echo $gcp_credentials > /tmp/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/tmp/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.GCP.encryption.passphrase }} /cache/backup.yaml; rm -rvf /cache/backup.yaml; mv /cache/backup.yaml.gpg /cache/backup-$date1.yaml.gpg; gcloud storage cp /cache/backup-$date1.yaml.gpg gs://$GCS_BUCKET/argocd/;
+            - echo $gcp_credentials > /tmp/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/tmp/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); gpg -c --batch --passphrase {{ .Values.global.GCP.encryption.passphrase }} /cache/backup.yaml; rm -rvf /cache/backup.yaml; mv /cache/backup.yaml.gpg /cache/backup-$date1.yaml.gpg; gsutil cp /cache/backup-$date1.yaml.gpg gs://$GCS_BUCKET/argocd/;
           {{- else}}
-            - echo $gcp_credentials > /tmp/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/tmp/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); mv /cache/backup.yaml /cache/backup-$date1.yaml; gcloud storage cp /cache/backup-$date1.yaml gs://$GCS_BUCKET/argocd/;
+            - echo $gcp_credentials > /tmp/gcp_credentials.json ; gcloud auth activate-service-account --key-file=/tmp/gcp_credentials.json ; date1=$(date +%Y%m%d-%H%M); mv /cache/backup.yaml /cache/backup-$date1.yaml; gsutil cp /cache/backup-$date1.yaml gs://$GCS_BUCKET/argocd/;
           {{- end }}
           volumes:
           - name: argocd-volume
             emptyDir: {}
           restartPolicy: OnFailure
           serviceAccountName: {{ .Values.argocd_backup.serviceAccountName }}
 {{- end }}
-{{- end }}
+{{- end }}

charts/devtron-backups/templates/backup-on-s3.yaml

@@ -8,8 +8,10 @@ metadata:
 type: opaque
 data:
     S3_BUCKET_NAME: {{ .Values.global.S3.S3_BUCKET_NAME | b64enc }}
+    {{- if not .Values.global.S3.NODE_ROLE }}
     AWS_ACCESS_KEY: {{ .Values.global.S3.S3_ACCESS_KEY | b64enc }}
     AWS_SECRET_KEY: {{ .Values.global.S3.S3_SECRET_KEY | b64enc }}
+    {{- end }}
     AWS_REGION: {{ .Values.global.S3.AWS_REGION | default "us-east-1" | b64enc }}
 {{- end }}
 ---
@@ -53,11 +55,7 @@ spec:
             - mountPath: /tmp
               name: psql-volume
             env:
-            - name: S3_BUCKET
-              valueFrom:
-                secretKeyRef:
-                  name: devtron-s3-backup-secret
-                  key: S3_BUCKET_NAME
+            {{- if not .Values.global.S3.NODE_ROLE }}
             - name: AWS_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
@@ -68,6 +66,12 @@ spec:
                 secretKeyRef:
                   name: devtron-s3-backup-secret
                   key: AWS_SECRET_KEY
+            {{- end }}
+            - name: S3_BUCKET
+              valueFrom:
+                secretKeyRef:
+                  name: devtron-s3-backup-secret
+                  key: S3_BUCKET_NAME
             - name: AWS_DEFAULT_REGION
               valueFrom:
                 secretKeyRef:
@@ -130,12 +134,7 @@ spec:
             volumeMounts:
             - mountPath: /cache
               name: argocd-volume
-            env:
-            - name: S3_BUCKET
-              valueFrom:
-                secretKeyRef:
-                  name: devtron-s3-backup-secret
-                  key: S3_BUCKET_NAME
+            {{- if not .Values.global.S3.NODE_ROLE }}
             - name: AWS_ACCESS_KEY_ID
               valueFrom:
                 secretKeyRef:
@@ -146,6 +145,12 @@ spec:
                 secretKeyRef:
                   name: devtron-s3-backup-secret
                   key: AWS_SECRET_KEY
+            {{- end }}
+            - name: S3_BUCKET
+              valueFrom:
+                secretKeyRef:
+                  name: devtron-s3-backup-secret
+                  key: S3_BUCKET_NAME
             - name: AWS_DEFAULT_REGION
               valueFrom:
                 secretKeyRef:
@@ -175,4 +180,4 @@ spec:
           restartPolicy: OnFailure
           serviceAccountName: {{ .Values.argocd_backup.serviceAccountName }}
 {{- end }}
-{{- end }}
+{{- end }}

charts/devtron-backups/values.yaml

@@ -10,6 +10,8 @@ global:
     AWS_REGION: ""
     S3_ENDPOINT: ""
     # give the endpoint in case of non AWS storages with s3 protocol 
+    NODE_ROLE: false
+    # set true if node has access of buckets
     encryption:
     # passphrase used to encrypt/decrypt the file (encryption is done by gpg)
       enabled: false
@@ -70,4 +72,4 @@ argocd_backup:
   # args: "argocd admin export -n devtroncd > /cache/backup.yaml"
 
   # argocdImage: argoproj/argocd:v1.8.1  #(image for argo-V1)
-  # args: argocd-util export --namespace devtroncd > /cache/backup.yaml; #(argo-V1)
+  # args: argocd-util export --namespace devtroncd > /cache/backup.yaml; #(argo-V1)