From 19f9acc3f09f830670a90219ffd604ff0e671c0c Mon Sep 17 00:00:00 2001 From: lin onetwo Date: Sat, 29 Jun 2024 14:58:55 +0800 Subject: [PATCH] feat: allow using external mongodb --- deploy/helm/templates/api-service/secrets.yaml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/deploy/helm/templates/api-service/secrets.yaml b/deploy/helm/templates/api-service/secrets.yaml index d900bd1bf..a68705937 100644 --- a/deploy/helm/templates/api-service/secrets.yaml +++ b/deploy/helm/templates/api-service/secrets.yaml @@ -1,8 +1,12 @@ {{- $nameSpace := include "lowcoder.namespace" . -}} -{{- $mongoUser := first .Values.mongodb.auth.usernames -}} -{{- $mongoPassword := first .Values.mongodb.auth.passwords -}} -{{- $mongoServicename := .Values.mongodb.service.nameOverride -}} +{{- $mongoUser := (and .Values.mongodb.auth.usernames (first .Values.mongodb.auth.usernames)) | default "" -}} +{{- $mongoPassword := (and .Values.mongodb.auth.passwords (first .Values.mongodb.auth.passwords)) | default "" -}} {{- $lowcoderDatabase := first .Values.mongodb.auth.databases -}} +{{- $mongoSecret := lookup "v1" "Secret" $nameSpace .Values.mongodb.auth.existingSecret | default dict -}} +{{- $mongoSecretPassword := (index $mongoSecret.data "password" | default "" | b64dec) -}} +{{- $mongoServicename := .Values.mongodb.service.nameOverride | default "" -}} +{{- $externalUrl := .Values.mongodb.service.externalUrl -}} + apiVersion: v1 kind: Secret type: Opaque @@ -18,7 +22,7 @@ stringData: {{- if .Values.mongodb.enabled }} LOWCODER_MONGODB_URL: "mongodb://{{ $mongoUser }}:{{ $mongoPassword }}@{{ $mongoServicename }}.{{ $nameSpace }}.svc.cluster.local/{{ $lowcoderDatabase }}?retryWrites=true&ssl=false" {{- else }} - LOWCODER_MONGODB_URL: {{ .Values.mongodb.externalUrl | quote }} + LOWCODER_MONGODB_URL: "mongodb://{{ $mongoUser }}:{{ $mongoSecretPassword }}@{{ $externalUrl }}/{{ $lowcoderDatabase }}?retryWrites=true&ssl=false" {{- end }} LOWCODER_DB_ENCRYPTION_PASSWORD: {{ .Values.global.config.encryption.password | default "lowcoder.org" | quote }} LOWCODER_DB_ENCRYPTION_SALT: {{ .Values.global.config.encryption.salt | default "lowcoder.org" | quote }}