diff --git a/deploy/build/charts/laf-server/templates/deployment.yaml b/deploy/build/charts/laf-server/templates/deployment.yaml index 01b5388fa1..92663a6f6f 100644 --- a/deploy/build/charts/laf-server/templates/deployment.yaml +++ b/deploy/build/charts/laf-server/templates/deployment.yaml @@ -57,6 +57,8 @@ spec: value: {{ .Values.apiServerUrl | quote}} - name: JWT_EXPIRES_IN value: {{ .Values.jwt.expires_in | quote}} + - name: DEFAULT_REGION_DATABASE_URL + value: {{ .Values.default_region.database_url | quote}} - name: DEFAULT_REGION_MINIO_DOMAIN value: {{ .Values.default_region.minio_domain }} - name: DEFAULT_REGION_MINIO_EXTERNAL_ENDPOINT diff --git a/deploy/build/charts/laf-server/values.yaml b/deploy/build/charts/laf-server/values.yaml index fb148cea1e..e7ba92ac75 100644 --- a/deploy/build/charts/laf-server/values.yaml +++ b/deploy/build/charts/laf-server/values.yaml @@ -7,6 +7,8 @@ databaseUrl: "" apiServerUrl: "" # init default region conf default_region: + # db conf + database_url: "" # minio conf minio_domain: "" minio_external_endpoint: "" diff --git a/deploy/build/start.sh b/deploy/build/start.sh index d7bc4b5145..6ef584ecda 100644 --- a/deploy/build/start.sh +++ b/deploy/build/start.sh @@ -97,6 +97,7 @@ helm install server -n ${NAMESPACE} \ --set casdoor.client_id=${CASDOOR_CLIENT_ID} \ --set casdoor.client_secret=${CASDOOR_CLIENT_SECRET} \ --set casdoor.redirect_uri=${CASDOOR_REDIRECT_URI} \ + --set default_region.database_url=${DATABASE_URL} \ --set default_region.minio_domain=${MINIO_DOMAIN} \ --set default_region.minio_external_endpoint=${MINIO_EXTERNAL_ENDPOINT} \ --set default_region.minio_internal_endpoint=${MINIO_INTERNAL_ENDPOINT} \ diff --git a/server/src/constants.ts b/server/src/constants.ts index 9364b53ab6..ae2eda35cc 100644 --- a/server/src/constants.ts +++ b/server/src/constants.ts @@ -96,6 +96,11 @@ export class ServerConfig { return process.env.API_SERVER_URL || 'http://localhost:3000' } + /** default region conf */ + static get DEFAULT_REGION_DATABASE_URL() { + return process.env.DEFAULT_REGION_DATABASE_URL + } + static get DEFAULT_REGION_RUNTIME_DOMAIN() { return process.env.DEFAULT_REGION_RUNTIME_DOMAIN || 'localhost' } diff --git a/server/src/initializer/initializer.service.ts b/server/src/initializer/initializer.service.ts index 840de27636..fa3d1dc91c 100644 --- a/server/src/initializer/initializer.service.ts +++ b/server/src/initializer/initializer.service.ts @@ -34,7 +34,7 @@ export class InitializerService { databaseConf: { set: { driver: 'mongodb', - connectionUri: ServerConfig.DATABASE_URL, + connectionUri: ServerConfig.DEFAULT_REGION_DATABASE_URL, }, }, storageConf: {