3a4462d8 by Adam Heath

Fix WALE backups, add WALE_STORAGE_CLASS.

1 parent 39600130
...@@ -3,8 +3,3 @@ kind: ConfigMap ...@@ -3,8 +3,3 @@ kind: ConfigMap
3 metadata: 3 metadata:
4 name: postgres-extra-config 4 name: postgres-extra-config
5 --- 5 ---
6 apiVersion: v1
7 kind: Secret
8 metadata:
9 name: postgres-extra-config
10 ---
......
...@@ -8,5 +8,7 @@ backup: ...@@ -8,5 +8,7 @@ backup:
8 region: "" 8 region: ""
9 endpoint: "" 9 endpoint: ""
10 sse: "AES256" 10 sse: "AES256"
11 wale_endpoint: "" 11 wale:
12 endpoint: ""
13 storage_class: STANDARD
12 14
......
...@@ -18,16 +18,12 @@ releases: ...@@ -18,16 +18,12 @@ releases:
18 name: postgres-extra-config 18 name: postgres-extra-config
19 namespace: {{ .Values.namespace }} 19 namespace: {{ .Values.namespace }}
20 data: 20 data:
21 USE_WALE_BACKUP: "true"
22 AWS_ACCESS_KEY_ID: {{ .Values.backup.s3.access_key_id }} 21 AWS_ACCESS_KEY_ID: {{ .Values.backup.s3.access_key_id }}
23 WALE_S3_ENDPOINT: {{ .Values.backup.s3.wale_endpoint }}
24 - apiVersion: v1
25 kind: Secret
26 metadata:
27 name: postgres-extra-config
28 namespace: {{ .Values.namespace }}
29 stringData:
30 AWS_SECRET_ACCESS_KEY: {{ .Values.backup.s3.secret_access_key }} 22 AWS_SECRET_ACCESS_KEY: {{ .Values.backup.s3.secret_access_key }}
23 AWS_REGION: {{ .Values.backup.s3.region }}
24 USE_WALE_BACKUP: "true"
25 WALE_S3_ENDPOINT: {{ .Values.backup.s3.wale.endpoint }}
26 WALE_S3_STORAGE_CLASS: {{ .Values.backup.s3.wale.storage_class }}
31 27
32 - name: postgres-operator 28 - name: postgres-operator
33 namespace: {{ .Values.namespace }} 29 namespace: {{ .Values.namespace }}
...@@ -43,8 +39,6 @@ releases: ...@@ -43,8 +39,6 @@ releases:
43 logical_backup_s3_secret_access_key: {{ .Values.backup.s3.secret_access_key }} 39 logical_backup_s3_secret_access_key: {{ .Values.backup.s3.secret_access_key }}
44 logical_backup_s3_sse: {{ .Values.backup.s3.sse }} 40 logical_backup_s3_sse: {{ .Values.backup.s3.sse }}
45 configAwsOrGcp: 41 configAwsOrGcp:
46 aws_region: {{ .Values.backup.s3.region }}
47 wal_s3_bucket: {{ .Values.backup.s3.bucket }} 42 wal_s3_bucket: {{ .Values.backup.s3.bucket }}
48 configKubernetes: 43 configKubernetes:
49 pod_environment_configmap: {{ .Values.namespace }}/postgres-extra-config 44 pod_environment_configmap: {{ .Values.namespace }}/postgres-extra-config
50 pod_environment_secret: {{ .Values.namespace }}/postgres-extra-config
......