reflect connectionPool validation in Go code and publish in manifests and chart

This commit is contained in:
Felix Kunde
2020-02-13 13:47:19 +01:00
committed by Dmitrii Dolgov
parent 17d077e370
commit f0ceafa81e
9 changed files with 187 additions and 38 deletions
+9
View File
@@ -11,6 +11,15 @@ data:
cluster_history_entries: "1000"
cluster_labels: application:spilo
cluster_name_label: version
# connection_pool_default_cpu_limit: "1"
# connection_pool_default_cpu_request: "1"
# connection_pool_default_memory_limit: 100m
# connection_pool_default_memory_request: "100Mi"
# connection_pool_image: ""
# connection_pool_instances_number: 1
# connection_pool_mode: "transaction"
# connection_pool_schema: "pooler"
# connection_pool_user: "pooler"
# custom_service_annotations: "keyx:valuez,keya:valuea"
# custom_pod_annotations: "keya:valuea,keyb:valueb"
db_hosted_zone: db.example.com
+19 -19
View File
@@ -297,24 +297,6 @@ spec:
connection_pool:
type: object
properties:
connection_pool_schema:
type: string
#default: "pooler"
connection_pool_user:
type: string
#default: "pooler"
connection_pool_instances_number:
type: integer
#default: 1
connection_pool_image:
type: string
#default: "pierone.stups.zalan.do/acid/pgbouncer:0.0.1"
connection_pool_mode:
type: string
enum:
- "session"
- "transaction"
#default: "transaction"
connection_pool_default_cpu_limit:
type: string
pattern: '^(\d+m|\d+(\.\d{1,3})?)$'
@@ -330,7 +312,25 @@ spec:
connection_pool_default_memory_request:
type: string
pattern: '^(\d+(e\d+)?|\d+(\.\d+)?(e\d+)?[EPTGMK]i?)$'
#default: "100m"
#default: "100Mi"
connection_pool_image:
type: string
#default: "pierone.stups.zalan.do/acid/pgbouncer:0.0.1"
connection_pool_instances_number:
type: integer
#default: 1
connection_pool_mode:
type: string
enum:
- "session"
- "transaction"
#default: "transaction"
connection_pool_schema:
type: string
#default: "pooler"
connection_pool_user:
type: string
#default: "pooler"
status:
type: object
additionalProperties:
@@ -121,3 +121,13 @@ configuration:
scalyr_memory_limit: 500Mi
scalyr_memory_request: 50Mi
# scalyr_server_url: ""
connection_pool:
connection_pool_default_cpu_limit: "1"
connection_pool_default_cpu_request: "1"
connection_pool_default_memory_limit: 100m
connection_pool_default_memory_request: "100Mi"
# connection_pool_image: ""
connection_pool_instances_number: 1
connection_pool_mode: "transaction"
# connection_pool_schema: "pooler"
# connection_pool_user: "pooler"