Merge branch 'master' into fes-support

This commit is contained in:
Felix Kunde
2021-11-25 15:55:14 +01:00
36 changed files with 242 additions and 101 deletions
+1 -1
View File
@@ -606,7 +606,7 @@ grouped under the `logical_backup` key.
runs `pg_dumpall` on a replica if possible and uploads compressed results to
an S3 bucket under the key `/spilo/pg_cluster_name/cluster_k8s_uuid/logical_backups`.
The default image is the same image built with the Zalando-internal CI
pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.7.0"
pipeline. Default: "registry.opensource.zalan.do/acid/logical-backup:v1.7.1"
* **logical_backup_google_application_credentials**
Specifies the path of the google cloud service account json file. Default is empty.