905f53c9 by Adam Heath

Refactoring the pg-operator parameters.

1 parent 52741189
1 namespace: postgres-operator 1 namespace: postgres-operator
2 backup: 2 backup:
3 logical:
3 provider: s3 4 provider: s3
5 sse: "AES256"
6 s3:
7 endpoint: ""
4 schedule: "00 12 * * *" 8 schedule: "00 12 * * *"
5 num_to_retain: "5" 9 num_to_retain: "5"
6 s3: 10 s3:
...@@ -10,9 +14,5 @@ backup: ...@@ -10,9 +14,5 @@ backup:
10 bucket: "" 14 bucket: ""
11 region: "" 15 region: ""
12 endpoint: "" 16 endpoint: ""
13 sse: "AES256"
14 walg: 17 walg:
15 disable_sse: false 18 disable_sse: false
16 endpoint: ""
17 storage_class: STANDARD
18
......
...@@ -44,13 +44,13 @@ releases: ...@@ -44,13 +44,13 @@ releases:
44 disableValidation: true 44 disableValidation: true
45 values: 45 values:
46 - configLogicalBackup: 46 - configLogicalBackup:
47 logical_backup_provider: {{ .Values.backup.provider }} 47 logical_backup_provider: {{ .Values.backup.logical.provider }}
48 logical_backup_s3_access_key_id: {{ .Values.backup.s3.access_key_id }} 48 logical_backup_s3_endpoint: {{ .Values.backup | get "logical.s3.endpoint" ( .Values.backup | get "s3.endpoint" "" ) }}
49 logical_backup_s3_bucket: {{ .Values.backup.s3.bucket }} 49 logical_backup_s3_access_key_id: {{ .Values.backup | get "logical.s3.access_key_id" .Values.backup.s3.access_key_id }}
50 logical_backup_s3_region: {{ .Values.backup.s3.region }} 50 logical_backup_s3_secret_access_key: {{ .Values.backup | get "logical.s3.secret_access_key" .Values.backup.s3.secret_access_key }}
51 logical_backup_s3_endpoint: {{ .Values.backup.s3.endpoint }} 51 logical_backup_s3_bucket: {{ .Values.backup | get "logical.s3.bucket" .Values.backup.s3.bucket }}
52 logical_backup_s3_secret_access_key: {{ .Values.backup.s3.secret_access_key }} 52 logical_backup_s3_region: {{ .Values.backup | get "logical.s3.region" ( .Values.backup | get "s3.region" "" ) }}
53 logical_backup_s3_sse: {{ .Values.backup.s3.sse }} 53 logical_backup_s3_sse: {{ .Values.backup | get "logical.s3.sse" ( .Values.backup | get "s3.sse" "" ) }}
54 configAwsOrGcp: 54 configAwsOrGcp:
55 wal_s3_bucket: {{ .Values.backup.s3.bucket }} 55 wal_s3_bucket: {{ .Values.backup.s3.bucket }}
56 configKubernetes: 56 configKubernetes:
......