Add support for additionalCommandArgs and configurable secretKey fields in barmanObjectStore.

Signed-off-by: Austin Marten <[email protected]>

Author: austinmarten1

charts/cluster/templates/_backup.tpl

@@ -10,12 +10,20 @@ backup:
       encryption: {{ .Values.backups.wal.encryption }}
       {{- end }}
       maxParallel: {{ .Values.backups.wal.maxParallel }}
+      {{- if .Values.backups.wal.additionalCommandArgs }}
+      additionalCommandArgs:
+        {{- toYaml .Values.backups.wal.additionalCommandArgs | nindent 8 }}
+      {{- end }}
     data:
       compression: {{ .Values.backups.data.compression }}
       {{- if .Values.backups.data.encryption }}
       encryption: {{ .Values.backups.data.encryption }}
       {{- end }}
       jobs: {{ .Values.backups.data.jobs }}
+      {{- if .Values.backups.data.additionalCommandArgs }}
+      additionalCommandArgs:
+        {{- toYaml .Values.backups.data.additionalCommandArgs | nindent 8 }}
+      {{- end }}
 
     {{- $d := dict "chartFullname" (include "cluster.fullname" .) "scope" .Values.backups "secretPrefix" "backup" }}
     {{- include "cluster.barmanObjectStoreConfig" $d | nindent 2 }}

charts/cluster/templates/_barman_object_store.tpl

@@ -28,10 +28,10 @@
   {{- else }}
     accessKeyId:
       name: {{ $secretName }}
-      key: ACCESS_KEY_ID
+      key: {{ .scope.secret.accessKeyIdField | default "ACCESS_KEY_ID" }}
     secretAccessKey:
       name: {{ $secretName }}
-      key: ACCESS_SECRET_KEY
+      key: {{ .scope.secret.secretAccessKeyField | default "ACCESS_SECRET_KEY" }}
   {{- end }}
 {{- else if eq .scope.provider "azure" }}
   {{- if empty .scope.destinationPath }}

charts/cluster/values.yaml

@@ -418,6 +418,8 @@ backups:
     create: true
     # -- Name of the backup credentials secret
     name: ""
+    accessKeyIdField: ""
+    secretAccessKeyField: ""
 
   wal:
     # -- WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
@@ -426,13 +428,15 @@ backups:
     encryption: AES256
     # -- Number of WAL files to be archived or restored in parallel.
     maxParallel: 1
+    additionalCommandArgs: []
   data:
     # -- Data compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.
     compression: gzip
     # -- Whether to instruct the storage provider to encrypt data files. One of `` (use the storage container default), `AES256` or `aws:kms`.
     encryption: AES256
     # -- Number of data files to be archived or restored in parallel.
     jobs: 2
+    additionalCommandArgs: []
 
   scheduledBackups:
     -