Skip to content

Commit a4d7534

Browse files
ercperedaercpereda
committed
feat(383) Define keyNames to backups.secrets
1 parent f4a74a3 commit a4d7534

File tree

7 files changed

+51
-15
lines changed

7 files changed

+51
-15
lines changed

‎charts/cluster/README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,13 @@ refer to the [CloudNativePG Documentation](https://cloudnative-pg.io/documentat
145145
| backups.scheduledBackups[0].schedule | string | `"0 0 0 * * *"` | Schedule in cron format |
146146
| backups.secret.create | bool | `true` | Whether to create a secret for the backup credentials |
147147
| backups.secret.name | string | `""` | Name of the backup credentials secret |
148+
| backups.secret.keyNames.accessKey | string | `"ACCESS_KEY_ID"` | Name of the s3 accessKey secret key |
149+
| backups.secret.keyNames.secretKey | string | `"ACCESS_SECRET_KEY"` | Name of the s3 secretKey secret key |
150+
| backups.secret.keyNames.applicationCredentials | string | `"APPLICATION_CREDENTIALS"` | Name of the google applicationCredentials secret key |
151+
| backups.secret.keyNames.connectionString | string | `"AZURE_CONNECTION_STRING"` | Name of the azure connectionString secret key |
152+
| backups.secret.keyNames.storageAccount | string | `"AZURE_STORAGE_ACCOUNT"` | Name of the azure storageAccount secret key |
153+
| backups.secret.keyNames.storageKey | string | `"AZURE_STORAGE_KEY"` | Name of the azure storageKey secret key |
154+
| backups.secret.keyNames.storageSasToken | string | `"AZURE_STORAGE_SAS_TOKEN"` | Name of the azure storageSasToken secret key |
148155
| backups.wal.compression | string | `"gzip"` | WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`. |
149156
| backups.wal.encryption | string | `"AES256"` | Whether to instruct the storage provider to encrypt WAL files. One of `` (use the storage container default), `AES256` or `aws:kms`. |
150157
| backups.wal.maxParallel | int | `1` | Number of WAL files to be archived or restored in parallel. |

‎charts/cluster/templates/_barman_object_store.tpl

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@
2525
s3Credentials:
2626
accessKeyId:
2727
name: {{ $secretName }}
28-
key: ACCESS_KEY_ID
28+
key: {{ required ".Values.backups.secret.keyNames.accessKey is required, but not specified" .scope.secret.keyNames.accessKey }}
2929
secretAccessKey:
3030
name: {{ $secretName }}
31-
key: ACCESS_SECRET_KEY
31+
key: {{ required ".Values.backups.secret.keyNames.secretKey is required, but not specified" .scope.secret.keyNames.secretKey }}
3232
{{- else if eq .scope.provider "azure" }}
3333
{{- if empty .scope.destinationPath }}
3434
destinationPath: "https://{{ required "You need to specify Azure storageAccount if destinationPath is not specified." .scope.azure.storageAccount }}.{{ .scope.azure.serviceName }}.core.windows.net/{{ .scope.azure.containerName }}{{ .scope.azure.path }}"
@@ -40,19 +40,19 @@
4040
{{- else if .scope.azure.connectionString }}
4141
connectionString:
4242
name: {{ $secretName }}
43-
key: AZURE_CONNECTION_STRING
43+
key: {{ required ".Values.backups.secret.keyNames.connectionString is required, but not specified" .scope.secret.keyNames.connectionString }}
4444
{{- else }}
4545
storageAccount:
4646
name: {{ $secretName }}
47-
key: AZURE_STORAGE_ACCOUNT
47+
key: {{ required ".Values.backups.secret.keyNames.storageAccount is required, but not specified" .scope.secret.keyNames.storageAccount }}
4848
{{- if .scope.azure.storageKey }}
4949
storageKey:
5050
name: {{ $secretName }}
51-
key: AZURE_STORAGE_KEY
51+
key: {{ required ".Values.backups.secret.keyNames.storageKey is required, but not specified" .scope.secret.keyNames.storageKey }}
5252
{{- else }}
5353
storageSasToken:
5454
name: {{ $secretName }}
55-
key: AZURE_STORAGE_SAS_TOKEN
55+
key: {{ required ".Values.backups.secret.keyNames.storageSasToken is required, but not specified" .scope.secret.keyNames.storageSasToken }}
5656
{{- end }}
5757
{{- end }}
5858
{{- else if eq .scope.provider "google" }}
@@ -65,7 +65,7 @@
6565
{{- if not .scope.google.gkeEnvironment }}
6666
applicationCredentials:
6767
name: {{ $secretName }}
68-
key: APPLICATION_CREDENTIALS
68+
key: {{ required ".Values.backups.secret.keyNames.applicationCredentials is required, but not specified" .scope.secret.keyNames.applicationCredentials }}
6969
{{- end }}
7070
{{- end -}}
7171
{{- end -}}

‎charts/cluster/templates/backup-azure-creds.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ kind: Secret
44
metadata:
55
name: {{ default (printf "%s-backup-azure-creds" (include "cluster.fullname" .)) .Values.backups.secret.name }}
66
data:
7-
AZURE_CONNECTION_STRING: {{ .Values.backups.azure.connectionString | b64enc | quote }}
8-
AZURE_STORAGE_ACCOUNT: {{ .Values.backups.azure.storageAccount | b64enc | quote }}
9-
AZURE_STORAGE_KEY: {{ .Values.backups.azure.storageKey | b64enc | quote }}
10-
AZURE_STORAGE_SAS_TOKEN: {{ .Values.backups.azure.storageSasToken | b64enc | quote }}
7+
{{ required ".Values.backups.secret.keyNames.connectionString is required, but not specified" .Values.backups.secret.keyNames.connectionString }}: {{ .Values.backups.azure.connectionString | b64enc | quote }}
8+
{{ required ".Values.backups.secret.keyNames.storageAccount is required, but not specified" .Values.backups.secret.keyNames.storageAccount }}: {{ .Values.backups.azure.storageAccount | b64enc | quote }}
9+
{{ required ".Values.backups.secret.keyNames.storageKey is required, but not specified" .Values.backups.secret.keyNames.storageKey }}: {{ .Values.backups.azure.storageKey | b64enc | quote }}
10+
{{ required ".Values.backups.secret.keyNames.storageSasToken is required, but not specified" .Values.backups.secret.keyNames.storageSasToken }}: {{ .Values.backups.azure.storageSasToken | b64enc | quote }}
1111
{{- end }}

‎charts/cluster/templates/backup-google-creds.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@ kind: Secret
44
metadata:
55
name: {{ default (printf "%s-backup-google-creds" (include "cluster.fullname" .)) .Values.backups.secret.name }}
66
data:
7-
APPLICATION_CREDENTIALS: {{ .Values.backups.google.applicationCredentials | b64enc | quote }}
7+
{{ required ".Values.backups.secret.keyNames.applicationCredentials is required, but not specified" .Values.backups.secret.keyNames.applicationCredentials }}: {{ .Values.backups.google.applicationCredentials | b64enc | quote }}
88
{{- end }}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ kind: Secret
44
metadata:
55
name: {{ default (printf "%s-backup-s3-creds" (include "cluster.fullname" .)) .Values.backups.secret.name }}
66
data:
7-
ACCESS_KEY_ID: {{ required ".Values.backups.s3.accessKey is required, but not specified." .Values.backups.s3.accessKey | b64enc | quote }}
8-
ACCESS_SECRET_KEY: {{ required ".Values.backups.s3.secretKey is required, but not specified." .Values.backups.s3.secretKey | b64enc | quote }}
7+
{{ required ".Values.backups.secret.keyNames.accessKey is required, but not specified" .Values.backups.secret.keyNames.accessKey }}: {{ required ".Values.backups.s3.accessKey is required, but not specified." .Values.backups.s3.accessKey | b64enc | quote }}
8+
{{ required ".Values.backups.secret.keyNames.secretKey is required, but not specified" .Values.backups.secret.keyNames.secretKey }}: {{ required ".Values.backups.s3.secretKey is required, but not specified." .Values.backups.s3.secretKey | b64enc | quote }}
99
{{- end }}

‎charts/cluster/values.schema.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,27 @@
145145
},
146146
"name": {
147147
"type": "string"
148-
}
148+
},
149+
"keyNames": {
150+
"type": "object",
151+
"properties": {
152+
"accessKey": {
153+
"type": "string"
154+
},
155+
"secretKey": {
156+
"type": "string"
157+
},
158+
"applicationCredentials": {
159+
"type": "string"
160+
},
161+
"connectionString": {
162+
"type": "string"
163+
},
164+
"storageAccount": {
165+
"type": "string"
166+
}
167+
}
168+
}
149169
}
150170
},
151171
"wal": {

‎charts/cluster/values.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,6 +316,15 @@ backups:
316316
create: true
317317
# -- Name of the backup credentials secret
318318
name: ""
319+
# -- Name of the keys inside the secret
320+
keyNames:
321+
accessKey: ACCESS_KEY_ID
322+
secretKey: ACCESS_SECRET_KEY
323+
applicationCredentials: APPLICATION_CREDENTIALS
324+
connectionString: AZURE_CONNECTION_STRING
325+
storageAccount: AZURE_STORAGE_ACCOUNT
326+
storageKey: AZURE_STORAGE_KEY
327+
storageSasToken: AZURE_STORAGE_SAS_TOKEN
319328

320329
wal:
321330
# -- WAL compression method. One of `` (for no compression), `gzip`, `bzip2` or `snappy`.

0 commit comments

Comments
 (0)