public_git/postgres-operator
1
0
Fork 0
mirror of https://github.com/zalando/postgres-operator.git synced 2026-10-06 08:52:15 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into delete-volume-on-scale-down

Browse Source
This commit is contained in:
Sergey Dudoladov
2020-04-08 07:18:49 +02:00
parent ff48ba94ff 4dee8918bd
commit a562a6ed59
20 changed files with 104 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
manifests/complete-postgres-manifest.yaml
+2
View File
@@ -67,6 +67,8 @@ spec:
ttl: 30
loop_wait: &loop_wait 10
retry_timeout: 10
synchronous_mode: false
synchronous_mode_strict: false
maximum_lag_on_failover: 33554432
# restore a Postgres DB with point-in-time-recovery
manifests/configmap.yaml
+2 -1
View File
@@ -15,7 +15,7 @@ data:
# connection_pooler_default_cpu_request: "500m"
# connection_pooler_default_memory_limit: 100Mi
# connection_pooler_default_memory_request: 100Mi
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-6"
# connection_pooler_max_db_connections: 60
# connection_pooler_mode: "transaction"
# connection_pooler_number_of_instances: 2
@@ -43,6 +43,7 @@ data:
# enable_team_superuser: "false"
enable_teams_api: "false"
# etcd_host: ""
# kubernetes_use_configmaps: "false"
# infrastructure_roles_secret_name: postgresql-infrastructure-roles
# inherited_labels: application,environment
# kube_iam_role: ""
manifests/operatorconfiguration.crd.yaml
+2
View File
@@ -44,6 +44,8 @@ spec:
type: boolean
etcd_host:
type: string
kubernetes_use_configmaps:
type: boolean
max_instances:
type: integer
minimum: -1 # -1 = disabled
manifests/postgresql-operator-default-configuration.yaml
+2 -1
View File
@@ -5,6 +5,7 @@ metadata:
configuration:
# enable_crd_validation: true
etcd_host: ""
# kubernetes_use_configmaps: false
docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
# enable_shm_volume: true
# enable_unused_pvc_deletion: false
@@ -127,7 +128,7 @@ configuration:
connection_pooler_default_cpu_request: "500m"
connection_pooler_default_memory_limit: 100Mi
connection_pooler_default_memory_request: 100Mi
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-5"
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-6"
# connection_pooler_max_db_connections: 60
connection_pooler_mode: "transaction"
connection_pooler_number_of_instances: 2
manifests/postgresql.crd.yaml
+4
View File
@@ -184,6 +184,10 @@ spec:
type: integer
maximum_lag_on_failover:
type: integer
synchronous_mode:
type: boolean
synchronous_mode_strict:
type: boolean
podAnnotations:
type: object
additionalProperties: