wikijs: bump to 2.5.309, helm chart 2.4.1
This commit is contained in:
@@ -81,7 +81,7 @@ Set postgres host
|
||||
{{- if .Values.postgresql.enabled -}}
|
||||
{{- template "wiki.postgresql.fullname" . -}}
|
||||
{{- else -}}
|
||||
{{- .Values.postgresql.postgresqlHost | quote -}}
|
||||
{{- .Values.postgresql.host | quote -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
@@ -101,8 +101,8 @@ Set postgres secretKey
|
||||
*/}}
|
||||
{{- define "wiki.postgresql.secretKey" -}}
|
||||
{{- if .Values.postgresql.enabled -}}
|
||||
"postgresql-password"
|
||||
"password"
|
||||
{{- else -}}
|
||||
{{- default "postgresql-password" .Values.postgresql.existingSecretKey | quote -}}
|
||||
{{- default "password" .Values.postgresql.auth.existingSecretKey | quote -}}
|
||||
{{- end -}}
|
||||
{{- end -}}
|
||||
|
||||
@@ -25,36 +25,36 @@ spec:
|
||||
- name: {{ .Chart.Name }}
|
||||
securityContext:
|
||||
{{- toYaml .Values.securityContext | nindent 12 }}
|
||||
image: "{{ .Values.image.repository }}:{{ default "latest" .Values.image.tag }}"
|
||||
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default .Chart.AppVersion }}"
|
||||
imagePullPolicy: {{ default "IfNotPresent" .Values.image.imagePullPolicy }}
|
||||
env:
|
||||
- name: DB_TYPE
|
||||
value: postgres
|
||||
- name: DB_HOST
|
||||
value: {{ template "wiki.postgresql.host" . }}
|
||||
- name: DB_SSL
|
||||
value: "{{ default "false" .Values.postgresql.ssl }}"
|
||||
- name: DB_PORT
|
||||
value: "{{ default "5432" .Values.postgresql.postgresqlPort }}"
|
||||
value: {{ default "5432" .Values.postgresql.port | quote }}
|
||||
- name: DB_SSL
|
||||
value: {{ .Values.postgresql.tls.enabled | quote }}
|
||||
- name: DB_NAME
|
||||
value: {{ default "wiki" .Values.postgresql.postgresqlDatabase }}
|
||||
value: {{ default "wiki" .Values.postgresql.auth.database }}
|
||||
{{- if .Values.postgresql.enabled }}
|
||||
- name: DB_USER
|
||||
value: {{ default "wiki" .Values.postgresql.postgresqlUsername }}
|
||||
value: {{ default "wiki" .Values.postgresql.auth.username }}
|
||||
- name: DB_PASS
|
||||
valueFrom:
|
||||
secretKeyRef:
|
||||
{{- if .Values.postgresql.existingSecret }}
|
||||
name: {{ .Values.postgresql.existingSecret }}
|
||||
{{- if .Values.postgresql.auth.existingSecret }}
|
||||
name: {{ .Values.postgresql.auth.existingSecret }}
|
||||
{{- else }}
|
||||
name: {{ template "wiki.postgresql.secret" . }}
|
||||
{{- end }}
|
||||
key: {{ template "wiki.postgresql.secretKey" . }}
|
||||
{{- else }}
|
||||
- name: DB_USER
|
||||
value: {{ default "wiki" .Values.postgresql.postgresqlUsername }}
|
||||
value: {{ default "wiki" .Values.postgresql.auth.username }}
|
||||
- name: DB_PASS
|
||||
value: {{ default "wiki" .Values.postgresql.postgresqlPassword }}
|
||||
value: {{ default "wiki" .Values.postgresql.auth.password }}
|
||||
{{- end }}
|
||||
ports:
|
||||
- name: http
|
||||
|
||||
Reference in New Issue
Block a user