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

merge with master and update image in e2e test

Browse Source
This commit is contained in:
Felix Kunde
2020-04-28 17:28:56 +02:00
parent 65fc09054b 1d009d9595
commit 13022fd6ca
13 changed files with 34 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
manifests/complete-postgres-manifest.yaml
+1 -1
View File
@@ -7,7 +7,7 @@ metadata:
# annotations:
# "acid.zalan.do/controller": "second-operator"
spec:
dockerImage: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
dockerImage: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115
teamId: "acid"
numberOfInstances: 2
users: # Application/Robot users
manifests/configmap.yaml
+2 -2
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-6"
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-7"
# connection_pooler_max_db_connections: 60
# connection_pooler_mode: "transaction"
# connection_pooler_number_of_instances: 2
@@ -29,7 +29,7 @@ data:
# default_cpu_request: 100m
# default_memory_limit: 500Mi
# default_memory_request: 100Mi
docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115
# enable_admin_role_for_users: "true"
# enable_crd_validation: "true"
# enable_database_access: "true"
manifests/operatorconfiguration.crd.yaml
+1 -1
View File
@@ -283,7 +283,7 @@ spec:
type: integer
ring_log_lines:
type: integer
scalyr:
scalyr: # deprecated
type: object
properties:
scalyr_api_key:
manifests/postgresql-operator-default-configuration.yaml
+2 -10
View File
@@ -3,12 +3,12 @@ kind: OperatorConfiguration
metadata:
name: postgresql-operator-default-configuration
configuration:
docker_image: registry.opensource.zalan.do/acid/spilo-cdp-12:1.6-p115
# enable_crd_validation: true
# enable_lazy_spilo_upgrade: false
# enable_shm_volume: true
etcd_host: ""
# kubernetes_use_configmaps: false
docker_image: registry.opensource.zalan.do/acid/spilo-12:1.6-p2
max_instances: -1
min_instances: -1
resync_period: 30m
@@ -118,20 +118,12 @@ configuration:
api_port: 8080
cluster_history_entries: 1000
ring_log_lines: 100
scalyr:
# scalyr_api_key: ""
scalyr_cpu_limit: "1"
scalyr_cpu_request: 100m
# scalyr_image: ""
scalyr_memory_limit: 500Mi
scalyr_memory_request: 50Mi
# scalyr_server_url: ""
connection_pooler:
connection_pooler_default_cpu_limit: "1"
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-6"
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer:master-7"
# connection_pooler_max_db_connections: 60
connection_pooler_mode: "transaction"
connection_pooler_number_of_instances: 2