Skip to content

Commit 0926cf7

Browse files
cdxkercdxker
committed
feat(helm): all services have configurable images
and imagePullPolicies
1 parent 04e80a9 commit 0926cf7

43 files changed

Lines changed: 306 additions & 338 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

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

‎helm/templates/clustering-cronjob.yaml‎

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

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

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

helm/templates/collapse-queries-script-deployment.yaml renamed to helm/templates/crons/collapse-queries-script-deployment.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,18 @@ spec:
66
schedule: "*/30 * * * *"
77
concurrencyPolicy: Forbid
88
suspend: {{ $.Values.config.trieve.disableCrons }}
9+
910
jobTemplate:
1011
spec:
1112
template:
1213
spec:
14+
{{- if $.Values.global.imagePullSecrets }}
15+
imagePullSecrets:
16+
{{- toYaml $.Values.global.imagePullSecrets | nindent 8 }}
17+
{{- end }}
1318
containers:
1419
- name: clustering
15-
image: {{ printf "%s:%s" "trieve/clickhouse-collapse-query-script" .Values.containers.clickhouse_collapse.tag }}
20+
image: {{ printf "%s/%s:%s" $.Values.global.image.registry $.Values.containers.clickhouse_collapse.repository .Values.containers.clickhouse_collapse.tag }}
1621
imagePullPolicy: IfNotPresent
1722
env:
1823
- name: CLICKHOUSE_DSN

helm/templates/dittofeed_cronjob.yaml renamed to helm/templates/crons/dittofeed_cronjob.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CronJob
33
metadata:
44
name: dittofeed-cronjob
55
annotations:
6-
checksum/config: {{ include (print $.Template.BasePath "/backend-configmap.yaml") . | sha256sum }}
6+
checksum/config: {{ include (print $.Template.BasePath "/settings/backend-configmap.yaml") . | sha256sum }}
77
labels:
88
app.kubernetes.io/name: dittofeed-cronjob
99
app.kubernetes.io/instance: {{ .Release.Name }}
@@ -16,9 +16,13 @@ spec:
1616
template:
1717
spec:
1818
restartPolicy: OnFailure
19+
{{- if $.Values.global.imagePullSecrets }}
20+
imagePullSecrets:
21+
{{- toYaml $.Values.global.imagePullSecrets | nindent 8 }}
22+
{{- end }}
1923
containers:
2024
- name: dittofeed-cronjob
21-
image: {{ printf "%s:%s" "trieve/word-id-cronjob" .Values.containers.word_id_cronjob.tag }}
25+
image: {{ printf "%s/%s:%s" $.Values.global.image.registry $.Values.containers.ditto_feed_cronjob.repository .Values.containers.word_id_cronjob.tag }}
2226
envFrom:
2327
- configMapRef:
2428
name: trieve-server-config

helm/templates/word-id-cronjob.yaml renamed to helm/templates/crons/word-id-cronjob.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ kind: CronJob
33
metadata:
44
name: word-id-cronjob
55
annotations:
6-
checksum/config: {{ include (print $.Template.BasePath "/backend-configmap.yaml") . | sha256sum }}
6+
checksum/config: {{ include (print $.Template.BasePath "/settings/backend-configmap.yaml") . | sha256sum }}
77
labels:
88
app.kubernetes.io/name: word-id-cronjob
99
app.kubernetes.io/instance: {{ .Release.Name }}
@@ -16,9 +16,13 @@ spec:
1616
template:
1717
spec:
1818
restartPolicy: OnFailure
19+
{{- if $.Values.global.imagePullSecrets }}
20+
imagePullSecrets:
21+
{{- toYaml $.Values.global.imagePullSecrets | nindent 8 }}
22+
{{- end }}
1923
containers:
2024
- name: word-id-cronjob
21-
image: {{ printf "%s:%s" "trieve/word-id-cronjob" .Values.containers.word_id_cronjob.tag }}
25+
image: {{ printf "%s/%s:%s" $.Values.global.image.registry $.Values.containers.word_id_cronjob.repository .Values.containers.word_id_cronjob.tag }}
2226
envFrom:
2327
- configMapRef:
2428
name: trieve-server-config

‎helm/templates/csv-jsonl-worker.yaml‎

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

helm/templates/chat-deployment.yaml renamed to helm/templates/deployments/chat-deployment.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,15 @@ spec:
1717
app.kubernetes.io/name: chat
1818
app.kubernetes.io/instance: {{ .Release.Name }}
1919
annotations:
20-
checksum/config: {{ include (print $.Template.BasePath "/frontend-configmap.yaml") . | sha256sum }}
20+
checksum/config: {{ include (print $.Template.BasePath "/settings/frontend-configmap.yaml") . | sha256sum }}
2121
spec:
22+
{{- if $.Values.global.imagePullSecrets }}
23+
imagePullSecrets:
24+
{{- toYaml $.Values.global.imagePullSecrets | nindent 8 }}
25+
{{- end }}
2226
containers:
2327
- name: chat
24-
image: {{ (printf "%s:%s" "trieve/chat" .Values.containers.chat.tag) }}
28+
image: {{ (printf "%s/%s:%s" $.Values.global.image.registry $.Values.containers.chat.repository .Values.containers.chat.tag) }}
2529
ports:
2630
- containerPort: 80
2731
envFrom:

helm/templates/dashboard-deployment.yaml renamed to helm/templates/deployments/dashboard-deployment.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ metadata:
66
app.kubernetes.io/name: dashboard
77
app.kubernetes.io/instance: {{ .Release.Name }}
88
annotations:
9-
checksum/config: {{ include (print $.Template.BasePath "/frontend-configmap.yaml") . | sha256sum }}
9+
checksum/config: {{ include (print $.Template.BasePath "/settings/frontend-configmap.yaml") . | sha256sum }}
1010
spec:
1111
replicas: {{ .Values.containers.dashboard.replicas | default 1 }}
1212
selector:
@@ -19,9 +19,13 @@ spec:
1919
app.kubernetes.io/name: dashboard
2020
app.kubernetes.io/instance: {{ .Release.Name }}
2121
spec:
22+
{{- if $.Values.global.imagePullSecrets }}
23+
imagePullSecrets:
24+
{{- toYaml $.Values.global.imagePullSecrets | nindent 8 }}
25+
{{- end }}
2226
containers:
2327
- name: dashboard
24-
image: {{ printf "%s:%s" "trieve/dashboard" .Values.containers.dashboard.tag }}
28+
image: {{ printf "%s/%s:%s" $.Values.global.image.registry $.Values.containers.dashboard.repository .Values.containers.dashboard.tag }}
2529
ports:
2630
- containerPort: 80
2731
envFrom:

helm/templates/embeddings-deployment.yaml renamed to helm/templates/deployments/embeddings-deployment.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,17 @@ spec:
2323
app.kubernetes.io/instance: {{ $.Release.Name }}
2424
spec:
2525
terminationGracePeriodSeconds: 30
26+
{{- if $.Values.global.imagePullSecrets }}
27+
imagePullSecrets:
28+
{{- toYaml $.Values.global.imagePullSecrets | nindent 8 }}
29+
{{- end }}
2630
containers:
2731
- name: {{ $name }}
2832
readinessProbe:
2933
httpGet:
3034
path: "/"
3135
port: 80
32-
image: {{ ternary (printf "ghcr.io/huggingface/text-embeddings-inference:%s" $service.tag) "ghcr.io/huggingface/text-embeddings-inference:cpu-1.2" $service.useGpu }}
36+
image: {{ printf "%s/%s:%s" $service.registry $service.repository $service.tag }}
3337
args:
3438
{{ (concat (list "--model-id" $service.model "--revision" $service.revision) $service.args) | toJson }}
3539
ports:

0 commit comments

Comments
 (0)