Fixing the issue where there would be mistmatching.

Author: austinmarten1

charts/cluster/templates/backup-s3-creds.yaml

@@ -5,6 +5,6 @@ metadata:
   name: {{ default (printf "%s-backup-s3-creds" (include "cluster.fullname" .)) .Values.backups.secret.name }}
   namespace: {{ include "cluster.namespace" . }}
 data:
-  ACCESS_KEY_ID: {{ required ".Values.backups.s3.accessKey is required, but not specified." .Values.backups.s3.accessKey | b64enc | quote }}
-  ACCESS_SECRET_KEY: {{ required ".Values.backups.s3.secretKey is required, but not specified." .Values.backups.s3.secretKey | b64enc | quote }}
+  {{ .Values.backups.secret.accessKeyIdField | default "ACCESS_KEY_ID" }}: {{ required ".Values.backups.s3.accessKey is required, but not specified." .Values.backups.s3.accessKey | b64enc | quote }}
+  {{ .Values.backups.secret.secretAccessKeyField | default "ACCESS_SECRET_KEY" }}: {{ required ".Values.backups.s3.secretKey is required, but not specified." .Values.backups.s3.secretKey | b64enc | quote }}
 {{- end }}

charts/cluster/templates/recovery-s3-creds.yaml

@@ -5,6 +5,6 @@ metadata:
   name: {{ default (printf "%s-recovery-s3-creds" (include "cluster.fullname" .)) .Values.recovery.secret.name }}
   namespace: {{ include "cluster.namespace" . }}
 data:
-  ACCESS_KEY_ID: {{ required ".Values.recovery.s3.accessKey is required, but not specified." .Values.recovery.s3.accessKey | b64enc | quote }}
-  ACCESS_SECRET_KEY: {{ required ".Values.recovery.s3.secretKey is required, but not specified." .Values.recovery.s3.secretKey | b64enc | quote }}
+  {{ .Values.recovery.secret.accessKeyIdField | default "ACCESS_KEY_ID" }}: {{ required ".Values.recovery.s3.accessKey is required, but not specified." .Values.recovery.s3.accessKey | b64enc | quote }}
+  {{ .Values.recovery.secret.secretAccessKeyField | default "ACCESS_SECRET_KEY" }}: {{ required ".Values.recovery.s3.secretKey is required, but not specified." .Values.recovery.s3.secretKey | b64enc | quote }}
 {{- end }}

charts/cluster/values.yaml

@@ -98,6 +98,10 @@ recovery:
     create: true
     # -- Name of the backup credentials secret
     name: ""
+    # Definable accessKeyIdField to use (Left blank defaults to ACCESS_KEY_ID)
+    accessKeyIdField: ""
+    # Definable accessKeyIdField to use (Left blank defaults to ACCESS_SECRET_KEY)
+    secretAccessKeyField: ""
 
   # See https://cloudnative-pg.io/documentation/1.22/bootstrap/#bootstrap-from-a-live-cluster-pg_basebackup
   pgBaseBackup:
@@ -418,7 +422,9 @@ backups:
     create: true
     # -- Name of the backup credentials secret
     name: ""
+    # Definable accessKeyIdField to use (Left blank defaults to ACCESS_KEY_ID)
     accessKeyIdField: ""
+    # Definable secretAccessKeyField to use (Left blank defaults to ACCESS_SECRET_KEY)
     secretAccessKeyField: ""
 
   wal: