bugfix: fixed issue with database uri being incorrect

Author: cdxker

charts/trieve/Chart.yaml

@@ -2,7 +2,7 @@ apiVersion: v2
 name: trieve
 description: Helm chart expressing Trieve deployment without any dependencies
 type: application
-version: 0.2.21
+version: 0.2.22
 appVersion: "0.12.0"
 dependencies:
   - name: qdrant

charts/trieve/templates/settings/_helpers.tpl

@@ -14,20 +14,18 @@ redis://:{{ $redisPassword }}@{{ $svcName }}:6379
 {{- end -}}
 
 {{- define "trieve.databaseUrl" -}}
-{{/* DATABASE_URL */}}
-{{ if $.Values.postgres.dbURI }}
-DATABASE_URL: {{ .Values.postgres.dbURI }}
-{{- else if $.Values.postgres.secretKeyRef }}
-{{- $secretName := .Values.postgres.secretKeyRef.name }}
-{{- $secretKey := .Values.postgres.secretKeyRef.key }}
-{{- with (lookup "v1" "Secret" .Release.Namespace $secretName) }}
-DATABASE_URL: {{ index .data $secretKey | b64dec }}
-{{- end }}
-{{- else }}
+{{- if $.Values.postgres.dbURI -}}
+{{ .Values.postgres.dbURI }}
+{{- else if $.Values.postgres.secretKeyRef -}}
+{{- $secretName := .Values.postgres.secretKeyRef.name -}}
+{{- $secretKey := .Values.postgres.secretKeyRef.key -}}
+{{- with (lookup "v1" "Secret" .Release.Namespace $secretName) -}}
+{{- index .data $secretKey | b64dec -}}
+{{- end -}}
+{{- else -}}
 {{- $secretName := printf "%s-trieve-postgres-app" .Release.Name -}}
-{{- with (lookup "v1" "Secret" .Release.Namespace $secretName) }}
-DATABASE_URL: {{ index .data "uri" | b64dec }}
-{{- end }}
-{{- end }}
-{{/* End DATABASE_URL */}}
-{{- end }}
+{{- with (lookup "v1" "Secret" .Release.Namespace $secretName) -}}
+{{- index .data "uri" | b64dec -}}
+{{- end -}}
+{{- end -}}
+{{- end -}}