From dab53196aac5763bbfd3d02010125d034e610565 Mon Sep 17 00:00:00 2001 From: Tomasz Torcz Date: Sat, 7 Jan 2023 14:40:12 +0100 Subject: [PATCH] feat(helm-chart): add configuration for syncapi/search --- charts/dendrite/README.md | 3 +++ charts/dendrite/templates/common.yaml | 3 +++ charts/dendrite/templates/dendrite-config.yaml | 4 ++++ charts/dendrite/values.yaml | 10 ++++++++++ 4 files changed, 20 insertions(+) diff --git a/charts/dendrite/README.md b/charts/dendrite/README.md index 5cb3f5153..c6cc7a7ef 100644 --- a/charts/dendrite/README.md +++ b/charts/dendrite/README.md @@ -216,6 +216,9 @@ For more information see: | syncapi.image.pullPolicy | string | `"IfNotPresent"` | image pull policy | | syncapi.image.repository | string | `"matrixdotorg/dendrite-polylith"` | image repository | | syncapi.image.tag | string | chart.appVersion | image tag | +| syncapi.config.search.enabled | bool | `false` | Fulltext indexing using [Bleve](https://github.com/blevesearch/bleve) | +| syncapi.config.search.index_path | string | `/var/dendrite/searchindex` | Where to store search index | +| syncapi.config.search.language | string | `en` | Indexing language | | userapi | object | values.yaml | Configure the User API For more information see [the sample dendrite configuration](https://github.com/matrix-org/dendrite/blob/main/dendrite-sample.polylith.yaml) | | userapi.config.bcrypt_cost | int | 10 | bcrypt cost (2^[cost] = rounds) | | userapi.database | object | See values.yaml | Override general dendrite.database parameters. | diff --git a/charts/dendrite/templates/common.yaml b/charts/dendrite/templates/common.yaml index ce67785e2..6750bc7de 100644 --- a/charts/dendrite/templates/common.yaml +++ b/charts/dendrite/templates/common.yaml @@ -19,6 +19,9 @@ {{- with (index $.Values "mediaapi") }} {{- $_ := set .persistence "media" $.Values.persistence.media -}} {{- end }} + {{- with (index $.Values "syncapi") }} + {{- $_ := set .persistence "search" $.Values.persistence.search -}} + {{- end }} {{- else }} {{ include "common.values.setup" . }} {{- $_ := set .Values.persistence "dendrite-key" (include "dendrite.keyVolume" . | fromYaml) -}} diff --git a/charts/dendrite/templates/dendrite-config.yaml b/charts/dendrite/templates/dendrite-config.yaml index eedb74168..688567e8c 100644 --- a/charts/dendrite/templates/dendrite-config.yaml +++ b/charts/dendrite/templates/dendrite-config.yaml @@ -189,6 +189,10 @@ stringData: max_idle_conns: {{ default .Values.dendrite.database.max_idle_conns .Values.syncapi.database.max_idle_conns }} conn_max_lifetime: {{ default .Values.dendrite.database.conn_max_lifetime .Values.syncapi.database.conn_max_lifetime }} {{- end }} + search: + enabled: {{ default "false" .Values.syncapi.config.search.enabled }} + index_path: {{ default "/var/dendrite/searchindex" .Values.syncapi.config.search.index_path | quote }} + language: {{ default "en" .Values.syncapi.config.search.language }} user_api: {{- if .Values.dendrite.polylithEnabled }} internal_api: diff --git a/charts/dendrite/values.yaml b/charts/dendrite/values.yaml index 9ec4bb386..31f7b8189 100644 --- a/charts/dendrite/values.yaml +++ b/charts/dendrite/values.yaml @@ -46,6 +46,11 @@ ingress: # -- Configure persistence settings for the chart under this key. # @default -- See values.yaml persistence: + search: + enabled: false + mountPath: &searchPath /var/dendrite/searchindex + accessMode: ReadWriteOnce + size: 5Gi media: enabled: false mountPath: &mediaPath /var/dendrite/media @@ -336,6 +341,11 @@ syncapi: # -- Maximum connection lifetime # @default -- dendrite.database.conn_max_lifetime conn_max_lifetime: null + config: + search: + enabled: "false" + index_path: *searchPath + language: "en" # more possible languages can be found at https://github.com/blevesearch/bleve/tree/master/analysis/lang # -- Configure the Room Server # For more information see [the sample dendrite configuration](https://github.com/matrix-org/dendrite/blob/main/dendrite-sample.polylith.yaml)