public_git
/
postgres-operator
mirror of https://github.com/zalando/postgres-operator.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

bump spilo version and use example for logical_backup_s3_bucket

This commit is contained in:
Felix Kunde 2019-07-03 16:57:33 +02:00
parent e0ef308b70
commit 3d241aee23
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
charts/postgres-operator/values-crd.yaml
View File

@ -18,7 +18,7 @@ configGeneral:
# etcd connection string for Patroni. Empty uses K8s-native DCS. # etcd connection string for Patroni. Empty uses K8s-native DCS.
etcd_host: "" etcd_host: ""
# Spilo docker image # Spilo docker image
docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9
# max number of instances in Postgres cluster. -1 = no limit # max number of instances in Postgres cluster. -1 = no limit
min_instances: -1 min_instances: -1
# min number of instances in Postgres cluster. -1 = no limit # min number of instances in Postgres cluster. -1 = no limit
@ -183,7 +183,7 @@ configLogicalBackup:
# image for pods of the logical backup job (example runs pg_dumpall) # image for pods of the logical backup job (example runs pg_dumpall)
logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup" logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
# S3 bucket to store backup results # S3 bucket to store backup results
logical_backup_s3_bucket: "" logical_backup_s3_bucket: "my-bucket-url"
# automate creation of human users with teams API service # automate creation of human users with teams API service
configTeamsApi: configTeamsApi:

4
charts/postgres-operator/values.yaml
View File

@ -18,7 +18,7 @@ configGeneral:
# etcd connection string for Patroni. Empty uses K8s-native DCS. # etcd connection string for Patroni. Empty uses K8s-native DCS.
etcd_host: "" etcd_host: ""
# Spilo docker image # Spilo docker image
docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9
# max number of instances in Postgres cluster. -1 = no limit # max number of instances in Postgres cluster. -1 = no limit
min_instances: "-1" min_instances: "-1"
# min number of instances in Postgres cluster. -1 = no limit # min number of instances in Postgres cluster. -1 = no limit
@ -178,7 +178,7 @@ configLogicalBackup:
# image for pods of the logical backup job (example runs pg_dumpall) # image for pods of the logical backup job (example runs pg_dumpall)
logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup" logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
# S3 bucket to store backup results # S3 bucket to store backup results
logical_backup_s3_bucket: "" logical_backup_s3_bucket: "my-bucket-url"
# automate creation of human users with teams API service # automate creation of human users with teams API service
configTeamsApi: configTeamsApi:

2
manifests/complete-postgres-manifest.yaml
View File

@ -3,7 +3,7 @@ kind: postgresql
metadata: metadata:
name: acid-test-cluster name: acid-test-cluster
spec: spec:
dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.5-p8 dockerImage: registry.opensource.zalan.do/acid/spilo-11:1.5-p9
init_containers: init_containers:
- name: date - name: date
image: busybox image: busybox

4
manifests/configmap.yaml
View File

@ -19,7 +19,7 @@ data:
# default_cpu_request: 100m # default_cpu_request: 100m
# default_memory_limit: 1Gi # default_memory_limit: 1Gi
# default_memory_request: 100Mi # default_memory_request: 100Mi
docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9
# enable_admin_role_for_users: "true" # enable_admin_role_for_users: "true"
# enable_database_access: "true" # enable_database_access: "true"
enable_master_load_balancer: "true" enable_master_load_balancer: "true"
@ -34,7 +34,7 @@ data:
# kube_iam_role: "" # kube_iam_role: ""
# log_s3_bucket: "" # log_s3_bucket: ""
# logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup" # logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
# logical_backup_s3_bucket: "" # logical_backup_s3_bucket: "my-bucket-url"
# logical_backup_schedule: "30 00 * * *" # logical_backup_schedule: "30 00 * * *"
master_dns_name_format: '{cluster}.{team}.staging.{hostedzone}' master_dns_name_format: '{cluster}.{team}.staging.{hostedzone}'
# master_pod_move_timeout: 10m # master_pod_move_timeout: 10m

4
manifests/postgresql-operator-default-configuration.yaml
View File

@ -4,7 +4,7 @@ metadata:
name: postgresql-operator-default-configuration name: postgresql-operator-default-configuration
configuration: configuration:
etcd_host: "" etcd_host: ""
docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p7 docker_image: registry.opensource.zalan.do/acid/spilo-11:1.5-p9
max_instances: -1 max_instances: -1
min_instances: -1 min_instances: -1
resync_period: 30m resync_period: 30m
@ -72,7 +72,7 @@ configuration:
logical_backup: logical_backup:
logical_backup_schedule: "30 00 * * *" logical_backup_schedule: "30 00 * * *"
logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup" logical_backup_docker_image: "registry.opensource.zalan.do/acid/logical-backup"
logical_backup_s3_bucket: "" logical_backup_s3_bucket: "my-bucket-url"
debug: debug:
debug_logging: true debug_logging: true
enable_database_access: true enable_database_access: true

2
pkg/util/config/config.go
View File

@ -85,7 +85,7 @@ type Config struct {
WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to' WatchedNamespace string `name:"watched_namespace"` // special values: "*" means 'watch all namespaces', the empty string "" means 'watch a namespace where operator is deployed to'
EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use k8s as a DCS EtcdHost string `name:"etcd_host" default:""` // special values: the empty string "" means Patroni will use k8s as a DCS
DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-11:1.5-p7"` DockerImage string `name:"docker_image" default:"registry.opensource.zalan.do/acid/spilo-11:1.5-p9"`
Sidecars map[string]string `name:"sidecar_docker_images"` Sidecars map[string]string `name:"sidecar_docker_images"`
// default name `operator` enables backward compatibility with the older ServiceAccountName field // default name `operator` enables backward compatibility with the older ServiceAccountName field
PodServiceAccountName string `name:"pod_service_account_name" default:"operator"` PodServiceAccountName string `name:"pod_service_account_name" default:"operator"`