Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
4f2dd36e
Unverified
Commit
4f2dd36e
authored
Jul 05, 2022
by
Don Kendall
Committed by
GitHub
Jul 05, 2022
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat(helm): expose DATABASE_URL (#5445)
parent
48077fc9
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
1 deletion
+10
-1
NOTES.txt
dev/helm/templates/NOTES.txt
+1
-1
deployment.yaml
dev/helm/templates/deployment.yaml
+5
-0
values.yaml
dev/helm/values.yaml
+4
-0
No files found.
dev/helm/templates/NOTES.txt
View file @
4f2dd36e
...
...
@@ -2,7 +2,7 @@
{{- if .Values.ingress.enabled }}
{{- range $host := .Values.ingress.hosts }}
{{- range .paths }}
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ . }}
http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .
path
}}
{{- end }}
{{- end }}
{{- else if contains "NodePort" .Values.service.type }}
...
...
dev/helm/templates/deployment.yaml
View file @
4f2dd36e
...
...
@@ -41,6 +41,10 @@ spec:
env
:
-
name
:
DB_TYPE
value
:
postgres
{{
- if .Values.externalPostgresql.databaseURL
}}
-
name
:
DATABASE_URL
value
:
{{
.Values.externalPostgresql.databaseURL
}}
{{
- else
}}
-
name
:
DB_HOST
value
:
{{
template "wiki.postgresql.host" .
}}
-
name
:
DB_PORT
...
...
@@ -62,6 +66,7 @@ spec:
name
:
{{
template "wiki.postgresql.secret" .
}}
{{
- end
}}
key
:
{{
template "wiki.postgresql.secretKey" .
}}
{{
- end
}}
-
name
:
HA_ACTIVE
value
:
{{
.Values.replicaCount | int | le 2 | quote
}}
{{
- with .Values.volumeMounts
}}
...
...
dev/helm/values.yaml
View file @
4f2dd36e
...
...
@@ -102,6 +102,10 @@ sideload:
# - name: HTTPS_PROXY
# 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.
## ref: https://github.com/kubernetes/charts/blob/master/stable/postgresql/README.md
##
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment