rename pooler parts and add example to manifest

This commit is contained in:
Felix Kunde
2020-03-27 13:43:35 +01:00
parent ba9cf68650
commit ecbe3b5e1d
35 changed files with 638 additions and 624 deletions
@@ -318,44 +318,44 @@ spec:
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
scalyr_server_url:
type: string
connection_pool:
connection_pooler:
type: object
properties:
connection_pool_schema:
connection_pooler_schema:
type: string
#default: "pooler"
connection_pool_user:
connection_pooler_user:
type: string
#default: "pooler"
connection_pool_image:
connection_pooler_image:
type: string
#default: "registry.opensource.zalan.do/acid/pgbouncer"
connection_pool_max_db_connections:
connection_pooler_max_db_connections:
type: integer
#default: 60
connection_pool_mode:
connection_pooler_mode:
type: string
enum:
- "session"
- "transaction"
#default: "transaction"
connection_pool_number_of_instances:
connection_pooler_number_of_instances:
type: integer
minimum: 2
#default: 2
connection_pool_default_cpu_limit:
connection_pooler_default_cpu_limit:
type: string
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
#default: "1"
connection_pool_default_cpu_request:
connection_pooler_default_cpu_request:
type: string
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
#default: "500m"
connection_pool_default_memory_limit:
connection_pooler_default_memory_limit:
type: string
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
#default: "100Mi"
connection_pool_default_memory_request:
connection_pooler_default_memory_request:
type: string
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
#default: "100Mi"
@@ -106,7 +106,7 @@ spec:
uid:
format: uuid
type: string
connectionPool:
connectionPooler:
type: object
properties:
dockerImage:
@@ -162,7 +162,7 @@ spec:
# Note: usernames specified here as database owners must be declared in the users key of the spec key.
dockerImage:
type: string
enableConnectionPool:
enableConnectionPooler:
type: boolean
enableLogicalBackup:
type: boolean
@@ -20,5 +20,5 @@ data:
{{ toYaml .Values.configDebug | indent 2 }}
{{ toYaml .Values.configLoggingRestApi | indent 2 }}
{{ toYaml .Values.configTeamsApi | indent 2 }}
{{ toYaml .Values.configConnectionPool | indent 2 }}
{{ toYaml .Values.configConnectionPooler | indent 2 }}
{{- end }}
@@ -34,6 +34,6 @@ configuration:
{{ toYaml .Values.configLoggingRestApi | indent 4 }}
scalyr:
{{ toYaml .Values.configScalyr | indent 4 }}
connection_pool:
{{ toYaml .Values.configConnectionPool | indent 4 }}
connection_pooler:
{{ toYaml .Values.configConnectionPooler | indent 4 }}
{{- end }}
+11 -11
View File
@@ -267,24 +267,24 @@ configScalyr:
# Memory request value for the Scalyr sidecar
scalyr_memory_request: 50Mi
configConnectionPool:
configConnectionPooler:
# db schema to install lookup function into
connection_pool_schema: "pooler"
connection_pooler_schema: "pooler"
# db user for pooler to use
connection_pool_user: "pooler"
connection_pooler_user: "pooler"
# docker image
connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer"
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer"
# max db connections the pooler should hold
connection_pool_max_db_connections: 60
connection_pooler_max_db_connections: 60
# default pooling mode
connection_pool_mode: "transaction"
connection_pooler_mode: "transaction"
# number of pooler instances
connection_pool_number_of_instances: 2
connection_pooler_number_of_instances: 2
# default resources
connection_pool_default_cpu_request: 500m
connection_pool_default_memory_request: 100Mi
connection_pool_default_cpu_limit: "1"
connection_pool_default_memory_limit: 100Mi
connection_pooler_default_cpu_request: 500m
connection_pooler_default_memory_request: 100Mi
connection_pooler_default_cpu_limit: "1"
connection_pooler_default_memory_limit: 100Mi
rbac:
# Specifies whether RBAC resources should be created
+11 -11
View File
@@ -244,24 +244,24 @@ configTeamsApi:
# teams_api_url: http://fake-teams-api.default.svc.cluster.local
# configure connection pooler deployment created by the operator
configConnectionPool:
configConnectionPooler:
# db schema to install lookup function into
connection_pool_schema: "pooler"
connection_pooler_schema: "pooler"
# db user for pooler to use
connection_pool_user: "pooler"
connection_pooler_user: "pooler"
# docker image
connection_pool_image: "registry.opensource.zalan.do/acid/pgbouncer"
connection_pooler_image: "registry.opensource.zalan.do/acid/pgbouncer"
# max db connections the pooler should hold
connection_pool_max_db_connections: 60
connection_pooler_max_db_connections: 60
# default pooling mode
connection_pool_mode: "transaction"
connection_pooler_mode: "transaction"
# number of pooler instances
connection_pool_number_of_instances: 2
connection_pooler_number_of_instances: 2
# default resources
connection_pool_default_cpu_request: 500m
connection_pool_default_memory_request: 100Mi
connection_pool_default_cpu_limit: "1"
connection_pool_default_memory_limit: 100Mi
connection_pooler_default_cpu_request: 500m
connection_pooler_default_memory_request: 100Mi
connection_pooler_default_cpu_limit: "1"
connection_pooler_default_memory_limit: 100Mi
rbac:
# Specifies whether RBAC resources should be created