Use separate secret in backupJob

Author: rwunderer

charts/kivitendo/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.3.1
+version: 1.3.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/kivitendo/templates/kivitendo-backup.yaml

@@ -43,12 +43,12 @@ spec:
                 - name: PGHOST
                   value: "{{ .Values.database.postgresHost }}"
                 - name: PGUSER
-                  value: "{{ .Values.database.postgresUser }}"
+                  value: "{{ .Values.backupJob.postgresUser }}"
                 - name: PGPASSWORD
                   valueFrom:
                     secretKeyRef:
-                      name: {{ .Values.database.postgresSecret.name }}
-                      key: {{ .Values.database.postgresSecret.key }}
+                      name: {{ .Values.backupJob.postgresSecret.name }}
+                      key: {{ .Values.backupJob.postgresSecret.key }}
               securityContext:
                 runAsNonRoot: true
                 runAsUser: 1001
@@ -78,12 +78,12 @@ spec:
                 - name: PGHOST
                   value: "{{ .Values.database.postgresHost }}"
                 - name: PGUSER
-                  value: "{{ .Values.database.postgresUser }}"
+                  value: "{{ .Values.backupJob.postgresUser }}"
                 - name: PGPASSWORD
                   valueFrom:
                     secretKeyRef:
-                      name: {{ .Values.database.postgresSecret.name }}
-                      key: {{ .Values.database.postgresSecret.key }}
+                      name: {{ .Values.backupJob.postgresSecret.name }}
+                      key: {{ .Values.backupJob.postgresSecret.key }}
                 - name: AWS_ACCESS_KEY_ID
                   valueFrom:
                     secretKeyRef:

charts/kivitendo/values.yaml

@@ -43,6 +43,11 @@ backupJob:
   s3BaseUrl: ""
   gpgRecipient: ""
 
+  postgresUser: "postgres"
+  postgresSecret:
+    name: ""
+    key: ""
+
   image:
     repository: rwunderer/postgres-s3backup
     pullPolicy: IfNotPresent