Skip to content

Commit 04e80a9

Browse files
cdxkercdxker
committed
feat(helm): option to disable crons, modify tei sha's, and disable
Ingress's
1 parent 10a7d86 commit 04e80a9

10 files changed

Lines changed: 31 additions & 54 deletions

‎helm/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: v2
22
name: trieve-helm
33
description: Helm chart expressing Trieve deployment without any dependencies
44
type: application
5-
version: 0.2.0
5+
version: 0.2.1
66
appVersion: "0.12.0"
77
dependencies:
88
- name: qdrant

‎helm/templates/backend-configmap.yaml‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,21 +48,6 @@ data:
4848
{{- if .Values.config.s3.region }}
4949
AWS_REGION: {{ .Values.config.s3.region }}
5050
{{- end }}
51-
{{- if .Values.config.pagefind_s3.endpoint }}
52-
S3_ENDPOINT_PAGEFIND: {{ .Values.config.pagefind_s3.endpoint }}
53-
{{- end }}
54-
{{- if .Values.config.pagefind_s3.accessKey }}
55-
S3_ACCESS_KEY_PAGEFIND: {{ .Values.config.pagefind_s3.accessKey }}
56-
{{- end }}
57-
{{- if .Values.config.pagefind_s3.secretKey }}
58-
S3_SECRET_KEY_PAGEFIND: {{ .Values.config.pagefind_s3.secretKey }}
59-
{{- end }}
60-
{{- if .Values.config.pagefind_s3.bucket }}
61-
S3_BUCKET_PAGEFIND: {{ .Values.config.pagefind_s3.bucket }}
62-
{{- end }}
63-
{{- if .Values.config.pagefind_s3.region }}
64-
AWS_REGION_PAGEFIND: {{ .Values.config.pagefind_s3.region }}
65-
{{- end }}
6651
COOKIE_SECURE: {{ .Values.config.trieve.cookieSecure | quote }}
6752
TIKA_URL: tika.default.svc.cluster.local
6853
OPENAI_BASE_URL: {{ .Values.config.openai.baseUrl }}

‎helm/templates/clustering-cronjob.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ metadata:
44
name: clustering-cronjob
55
spec:
66
schedule: "1 * * * *"
7+
suspend: {{ $.Values.config.trieve.disableCrons }}
78
concurrencyPolicy: Forbid
89
jobTemplate:
910
spec:

‎helm/templates/collapse-queries-script-deployment.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ metadata:
55
spec:
66
schedule: "*/30 * * * *"
77
concurrencyPolicy: Forbid
8+
suspend: {{ $.Values.config.trieve.disableCrons }}
89
jobTemplate:
910
spec:
1011
template:

‎helm/templates/dittofeed_cronjob.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
spec:
1111
schedule: "0 0 * * *"
1212
concurrencyPolicy: Replace
13+
suspend: {{ $.Values.config.trieve.disableCrons }}
1314
jobTemplate:
1415
spec:
1516
template:

‎helm/templates/embeddings-deployment.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ spec:
2929
httpGet:
3030
path: "/"
3131
port: 80
32-
image: {{ ternary "ghcr.io/huggingface/text-embeddings-inference:89-1.2" "ghcr.io/huggingface/text-embeddings-inference:cpu-1.2" $service.useGpu }}
32+
image: {{ ternary (printf "ghcr.io/huggingface/text-embeddings-inference:%s" $service.tag) "ghcr.io/huggingface/text-embeddings-inference:cpu-1.2" $service.useGpu }}
3333
args:
3434
{{ (concat (list "--model-id" $service.model "--revision" $service.revision) $service.args) | toJson }}
3535
ports:

‎helm/templates/ingress.yaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
{{- with $.Values.domains.chat }}
3+
{{ if not .disabled }}
34
apiVersion: networking.k8s.io/v1
45
kind: Ingress
56
metadata:
@@ -35,8 +36,10 @@ spec:
3536
port:
3637
number: 3000
3738
{{- end }}
39+
{{- end }}
3840
---
3941
{{- with $.Values.domains.server }}
42+
{{ if not .disabled }}
4043
apiVersion: networking.k8s.io/v1
4144
kind: Ingress
4245
metadata:
@@ -72,8 +75,10 @@ spec:
7275
port:
7376
number: 8090
7477
{{- end }}
78+
{{- end }}
7579
---
7680
{{- with $.Values.domains.search }}
81+
{{ if not .disabled }}
7782
apiVersion: networking.k8s.io/v1
7883
kind: Ingress
7984
metadata:
@@ -109,8 +114,10 @@ spec:
109114
port:
110115
number: 3001
111116
{{- end }}
117+
{{- end }}
112118
---
113119
{{- with $.Values.domains.dashboard }}
120+
{{ if not .disabled }}
114121
apiVersion: networking.k8s.io/v1
115122
kind: Ingress
116123
metadata:
@@ -146,4 +153,5 @@ spec:
146153
port:
147154
number: 3002
148155
{{- end }}
156+
{{- end }}
149157
---

‎helm/templates/video-worker-deployment.yaml‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎helm/templates/word-id-cronjob.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ metadata:
1010
spec:
1111
schedule: "0 0 * * *"
1212
concurrencyPolicy: Replace
13+
suspend: {{ $.Values.config.trieve.disableCrons }}
1314
jobTemplate:
1415
spec:
1516
template:

‎helm/values.yaml‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ clickhouse:
3939
installCrds: true
4040

4141
connection:
42+
# TODO modify password
4243
clickhouseDB: default
4344
clickhouseUser: default
4445
clickhousePassword: clickhouse
@@ -83,6 +84,7 @@ qdrant:
8384
enabled: true
8485
url: http://trieve-local-qdrant:6334
8586

87+
# TODO modify apiKey
8688
apiKey: "qdrant-api-key"
8789
# Qdrant values.yaml spec
8890
replicaCount: 3
@@ -169,9 +171,6 @@ containers:
169171
pagefind_worker:
170172
tag: sha-2b6d5eb
171173
resources: {}
172-
video_worker:
173-
tag: sha-2b6d5eb
174-
resources: {}
175174
clone_qdrant:
176175
tag: sha-2b6d5eb
177176
resources: {}
@@ -190,8 +189,9 @@ containers:
190189
tag: latest
191190
domains:
192191
dashboard:
192+
disabled: true
193193
host: dashboard.yourdomain.com
194-
# TODO modify as needed
194+
# TODO modify as needed for your ingress
195195
class: nginx
196196
# annotations:
197197
# cert-manager.io/cluster-issuer: "letsencrypt"
@@ -201,6 +201,7 @@ domains:
201201
# - dashboard.yourdomain.com
202202
# secretName: dashboard-ansear-ai
203203
server:
204+
disabled: true
204205
host: api.yourdomain.com
205206
class: nginx
206207
# annotations:
@@ -211,6 +212,7 @@ domains:
211212
# - dashboard.yourdomain.com
212213
# secretName: dashboard-ansear-ai
213214
search:
215+
disabled: true
214216
host: search.yourdomain.com
215217
class: nginx
216218
# annotations:
@@ -221,6 +223,7 @@ domains:
221223
# - dashboard.yourdomain.com
222224
# secretName: dashboard-ansear-ai
223225
chat:
226+
disabled: true
224227
host: chat.yourdomain.com
225228
class: nginx
226229
# annotations:
@@ -232,6 +235,7 @@ domains:
232235
# secretName: dashboard-ansear-ai
233236
config:
234237
vite:
238+
# TODO modify domain name
235239
apiHost: http://api.yourdomain.com/api
236240
searchUiUrl: http://search.yourdomain.com
237241
chatUiUrl: http://chat.yourdomain.com
@@ -253,11 +257,14 @@ config:
253257
delete_worker:
254258
batch_size: 10000
255259
trieve:
260+
# TODO modify domain name
261+
baseServerUrl: http://api.yourdomain.com
262+
263+
disableCrons: true
256264
batch_limit: 120
257265
bm25Active: true
258266
unlimited: true
259267
cookieSecure: false
260-
baseServerUrl: http://api.yourdomain.com
261268
embeddingServerOrigin: http://embedding-jina.default.svc.cluster.local
262269
sparseServerQueryOrigin: http://embedding-splade-query.default.svc.cluster.local
263270
sparseServerDocOrigin: http://embedding-splade-doc.default.svc.cluster.local
@@ -311,30 +318,30 @@ embeddings:
311318
- name: jina
312319
revision: main
313320
model: jinaai/jina-embeddings-v2-base-en
314-
tag:
321+
tag: "89-1.2"
315322
useGpu: true
316323
args: []
317324
- name: splade-doc
318325
model: naver/efficient-splade-VI-BT-large-doc
319-
tag:
326+
tag: "89-1.2"
320327
revision: main
321328
useGpu: true
322329
args: ["--pooling", "splade"]
323330
- name: splade-query
324331
model: naver/efficient-splade-VI-BT-large-query
325-
tag:
332+
tag: "89-1.2"
326333
revision: main
327334
useGpu: true
328335
args: ["--pooling", "splade"]
329336
- name: m3
330337
model: BAAI/bge-m3
331-
tag:
338+
tag: "89-1.2"
332339
revision: main
333340
useGpu: true
334341
args: []
335342
- name: reranker
336343
model: BAAI/bge-reranker-large
337-
tag:
344+
tag: "89-1.2"
338345
revision: refs/pr/4
339346
useGpu: true
340347
args: []

0 commit comments

Comments
 (0)