liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat(helm): expose DATABASE_URL (#5445)

Browse Source
This commit is contained in:
Don Kendall 2022-07-05 18:26:50 -04:00 committed by GitHub
parent 48077fc9e5
commit 4f2dd36e33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/helm/templates/NOTES.txt
View File

@ -2,7 +2,7 @@
{{- if .Values.ingress.enabled }} {{- if .Values.ingress.enabled }}
{{- range $host := .Values.ingress.hosts }} {{- range $host := .Values.ingress.hosts }}
{{- range .paths }} {{- range .paths }}
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }} http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- else if contains "NodePort" .Values.service.type }} {{- else if contains "NodePort" .Values.service.type }}

5
dev/helm/templates/deployment.yaml
View File

@ -41,6 +41,10 @@ spec:
env: env:
- name: DB_TYPE - name: DB_TYPE
value: postgres value: postgres
{{- if .Values.externalPostgresql.databaseURL }}
- name: DATABASE_URL
value: {{ .Values.externalPostgresql.databaseURL }}
{{- else }}
- name: DB_HOST - name: DB_HOST
value: {{ template "wiki.postgresql.host" . }} value: {{ template "wiki.postgresql.host" . }}
- name: DB_PORT - name: DB_PORT
@ -62,6 +66,7 @@ spec:
name: {{ template "wiki.postgresql.secret" . }} name: {{ template "wiki.postgresql.secret" . }}
{{- end }} {{- end }}
key: {{ template "wiki.postgresql.secretKey" . }} key: {{ template "wiki.postgresql.secretKey" . }}
{{- end }}
- name: HA_ACTIVE - name: HA_ACTIVE
value: {{ .Values.replicaCount | int | le 2 | quote }} value: {{ .Values.replicaCount | int | le 2 | quote }}
{{- with .Values.volumeMounts }} {{- with .Values.volumeMounts }}

4
dev/helm/values.yaml
View File

@ -102,6 +102,10 @@ sideload:
# - name: HTTPS_PROXY # - name: HTTPS_PROXY
# value: http://my.proxy.com:3128 # value: http://my.proxy.com:3128
## This will override the postgresql chart values
# externalPostgresql:
# databaseURL: postgresql://postgres:postgres@postgres:5432/wiki?sslmode=require
## Configuration values for the postgresql dependency. ## Configuration values for the postgresql dependency.
## ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md ## ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md
## ##