Skip to content

Commit 627f35a

Browse files
cdxkercdxker
committed
feature: update backend-secrets.yaml to have less serialization errors
1 parent d88e6d5 commit 627f35a

4 files changed

Lines changed: 69 additions & 27 deletions

File tree

‎argocd-app.yaml‎

Lines changed: 40 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,9 +87,9 @@ spec:
8787
pdf2md:
8888
apiKey: "" # Example: if this needs its own value/secret distinct from pdf2md.config.llm.apiKey
8989
apiKeyRef:
90-
enabled: false # Set to true and configure if pdf2md service requires auth key to be passed to trieve backend
91-
secretName: ""
92-
secretKey: ""
90+
enabled: true # Set to true and configure if pdf2md service requires auth key to be passed to trieve backend
91+
secretName: "trieve-unified-secret"
92+
secretKey: "pdf2mdInternalAuth"
9393

9494
s3:
9595
endpoint: https://us-sea-1.linodeobjects.com
@@ -478,14 +478,49 @@ spec:
478478
redisSecret:
479479
name: trieve-unified-secret
480480
key: redisUrl
481+
puppeeter_service_tag: v0.0.13
482+
firecrawl_tag: v0.0.55
483+
484+
scrapingBeeApiKey:
485+
num_workers_per_queue: 8
486+
proxy:
487+
enabled: false
488+
url:
489+
server:
490+
username:
491+
password:
492+
481493
redis:
482494
enabled: false
495+
commonConfiguration: |-
496+
maxclients 20000
497+
metrics:
498+
enabled: true
499+
serviceMonitor:
500+
enabled: true
501+
auth:
502+
password: "firecrawl-redis-password"
503+
master:
504+
disableCommands: []
505+
persistence:
506+
enabled: false
507+
pdb:
508+
create: false
509+
resources:
510+
requests:
511+
memory: 10Gi
512+
limits:
513+
memory: 10Gi
514+
replica:
515+
replicaCount: 0
483516

484517
syncPolicy:
485518
automated:
486-
prune: true
487-
selfHeal: true
519+
prune: false
520+
selfHeal: false
488521
allowEmpty: true
522+
syncOptions:
523+
- ServerSideApply=true
489524
retry:
490525
limit: 10
491526
backoff:

‎charts/pdf2md/templates/secret.yaml‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -5,30 +5,31 @@ metadata:
55
name: pdf2md-config
66
labels:
77
app.kubernetes.io/instance: {{ $.Release.Name }}
8-
stringData:
9-
REDIS_URL: {{ include "pdf2md.redisUrl" . | indent 2 }}
8+
type: Opaque
9+
data:
10+
REDIS_URL: {{ include "pdf2md.redisUrl" . | b64enc | quote }}
1011

1112
# Clickhouse
12-
CLICKHOUSE_URL: {{ $.Values.clickhouse.connection.clickhouseUrl }}
13-
CLICKHOUSE_DB: {{ $.Values.clickhouse.connection.clickhouseDB }}
14-
CLICKHOUSE_USER: {{ $.Values.clickhouse.connection.clickhouseUser }}
15-
CLICKHOUSE_PASSWORD: {{ $.Values.clickhouse.connection.clickhousePassword }}
13+
CLICKHOUSE_URL: {{ $.Values.clickhouse.connection.clickhouseUrl | b64enc | quote }}
14+
CLICKHOUSE_DB: {{ $.Values.clickhouse.connection.clickhouseDB | b64enc | quote }}
15+
CLICKHOUSE_USER: {{ $.Values.clickhouse.connection.clickhouseUser | b64enc | quote }}
16+
CLICKHOUSE_PASSWORD: {{ $.Values.clickhouse.connection.clickhousePassword | b64enc | quote }}
1617

1718
# S3
18-
S3_ENDPOINT: {{ $.Values.s3.endpoint }}
19-
S3_ACCESS_KEY: {{ $.Values.s3.accessKey }}
20-
S3_SECRET_KEY: {{ $.Values.s3.secretKey }}
21-
S3_BUCKET: {{ $.Values.s3.bucket }}
22-
AWS_REGION: {{ $.Values.s3.region }}
19+
S3_ENDPOINT: {{ $.Values.s3.endpoint | b64enc | quote }}
20+
S3_ACCESS_KEY: {{ $.Values.s3.accessKey | b64enc | quote }}
21+
S3_SECRET_KEY: {{ $.Values.s3.secretKey | b64enc | quote }}
22+
S3_BUCKET: {{ $.Values.s3.bucket | b64enc | quote }}
23+
AWS_REGION: {{ $.Values.s3.region | b64enc | quote }}
2324

2425
# PDF2MD conversion worker services
25-
LLM_BASE_URL: {{ $.Values.config.llm.baseUrl }}
26-
LLM_API_KEY: {{ $.Values.config.llm.apiKey }}
27-
LLM_MODEL: {{ $.Values.config.llm.model }}
26+
LLM_BASE_URL: {{ $.Values.config.llm.baseUrl | b64enc | quote }}
27+
LLM_API_KEY: {{ $.Values.config.llm.apiKey | b64enc | quote }}
28+
LLM_MODEL: {{ $.Values.config.llm.model | b64enc | quote }}
2829

2930
# PDF2MD HTTP API server
30-
API_KEY: {{ $.Values.config.pdf2md.apiKey }}
31+
API_KEY: {{ $.Values.config.pdf2md.apiKey | b64enc | quote }}
3132

32-
CHUNKR_API_URL: {{ $.Values.config.chunkr.baseUrl }}
33-
CHUNKR_API_KEY: {{ $.Values.config.chunkr.apiKey }}
33+
CHUNKR_API_URL: {{ $.Values.config.chunkr.baseUrl | b64enc | quote }}
34+
CHUNKR_API_KEY: {{ $.Values.config.chunkr.apiKey | b64enc | quote }}
3435
{{- end }}

‎charts/trieve/templates/settings/_helpers.tpl‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ redis://:{{ $redisPassword }}@{{ $svcName }}:6379
122122
name: {{ .Values.config.trieve.subtraceTokenRef.secretName }}
123123
key: {{ .Values.config.trieve.subtraceTokenRef.secretKey }}
124124
{{- end }}
125-
126125
{{ if .Values.pdf2md.enabled }}
127126
{{- if .Values.pdf2md.config.llm.apiKeyRef.enabled }}
128127
- name: PDF2MD_LLM_API_KEY
@@ -145,6 +144,13 @@ redis://:{{ $redisPassword }}@{{ $svcName }}:6379
145144
name: {{ .Values.pdf2md.s3.secretKeyRef.secretName }}
146145
key: {{ .Values.pdf2md.s3.secretKeyRef.secretKey }}
147146
{{- end }}
147+
{{- if .Values.pdf2md.config.pdf2md.apiKeyRef.enabled }}
148+
- name: PDF2MD_AUTH
149+
valueFrom:
150+
secretKeyRef:
151+
name: {{ .Values.pdf2md.config.pdf2md.apiKeyRef.secretName }}
152+
key: {{ .Values.pdf2md.config.pdf2md.apiKeyRef.secretKey }}
153+
{{- end }}
148154
{{- end }}
149155
{{- if .Values.redis.auth.secretKeyRef.enabled }}
150156
- name: REDIS_URL

‎charts/trieve/templates/settings/backend-secrets.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ data:
1212
DATABASE_URL: {{ include "trieve.databaseUrl" . | b64enc | quote }}
1313
REDIS_URL: {{ include "trieve.redisUrl" . | b64enc | quote }}
1414
QDRANT_URL: {{ .Values.qdrant.url | b64enc | quote }}
15-
QDRANT_API_KEY: {{ .Values.qdrant.apiKey | quote | b64enc | quote }}
15+
QDRANT_API_KEY: {{ .Values.qdrant.apiKey | quote | b64enc }}
1616
CLICKHOUSE_URL: {{ .Values.clickhouse.connection.clickhouseUrl | b64enc | quote }}
1717
CLICKHOUSE_DB: {{ .Values.clickhouse.connection.clickhouseDB | b64enc | quote }}
1818
CLICKHOUSE_USER: {{ .Values.clickhouse.connection.clickhouseUser | b64enc | quote }}
@@ -73,7 +73,7 @@ data:
7373
USE_ANALYTICS: {{ "true" | b64enc | quote }}
7474
BM25_ACTIVE: {{ .Values.config.trieve.bm25Active | toString | b64enc | quote }}
7575
SUBTRACE_TOKEN: {{ .Values.config.trieve.subtraceToken | b64enc | quote }}
76-
FIRECRAWL_URL: http://api.firecrawl.svc.cluster.local:3002
76+
FIRECRAWL_URL: {{ .Values.config.trieve.firecrawlUrl | b64enc | quote }}
7777
DITTOFEED_API_KEY: {{ .Values.config.trieve.dittofeedApiKey | b64enc | quote }}
7878
CREATE_QDRANT_COLLECTIONS: {{ .Values.config.qdrant.initCollections | toString | b64enc | quote }}
7979
CHAT_COMPLETION_TIMEOUT_SECS: {{ .Values.config.trieve.chatCompletionTimeoutSecs | toString | b64enc | quote }}
@@ -84,6 +84,6 @@ data:
8484
BATCH_ETL_URL: {{ .Values.config.trieve.batchEtlUrl | b64enc | quote }}
8585
{{- if .Values.pdf2md.enabled }}
8686
PDF2MD_URL: {{ "http://pdf2md-service:8081" | b64enc | quote }}
87-
PDF2MD_AUTH: {{ include "trieve.resolveValue" (dict "currentValue" (include "trieve.pdf2md.config.pdf2md.get" (dict "path" "apiKey" "default" "" "context" $)) "valueRef" .Values.pdf2md.config.pdf2md.apiKeyRef "context" $) | b64enc | quote }}
87+
PDF2MD_AUTH: {{ .Values.pdf2md.config.pdf2md.apiKey | b64enc | quote }}
8888
{{- end }}
89-
{{- end }}
89+
{{- end }}

0 commit comments

Comments
 (0)