Merge branch 'master' into internal-load-balancer

This commit is contained in:
Felix Kunde
2020-06-04 09:49:46 +02:00
12 changed files with 225 additions and 2 deletions
+6
View File
@@ -206,12 +206,18 @@ configAwsOrGcp:
# AWS region used to store ESB volumes
aws_region: eu-central-1
# GCP credentials that will be used by the operator / pods
# gcp_credentials: ""
# AWS IAM role to supply in the iam.amazonaws.com/role annotation of Postgres pods
# kube_iam_role: ""
# S3 bucket to use for shipping postgres daily logs
# log_s3_bucket: ""
# GCS bucket to use for shipping WAL segments with WAL-E
# wal_gs_bucket: ""
# S3 bucket to use for shipping WAL segments with WAL-E
# wal_s3_bucket: ""
+6
View File
@@ -204,6 +204,12 @@ configAwsOrGcp:
# S3 bucket to use for shipping WAL segments with WAL-E
# wal_s3_bucket: ""
# GCS bucket to use for shipping WAL segments with WAL-E
# wal_gs_bucket: ""
# GCP credentials for setting the GOOGLE_APPLICATION_CREDNETIALS environment variable
# gcp_credentials: ""
# configure K8s cron job managed by the operator
configLogicalBackup:
# image for pods of the logical backup job (example runs pg_dumpall)