wikijs: bump to 2.5.309, helm chart 2.4.1

This commit is contained in:
ace
2026-01-03 22:34:08 +03:00
parent bea29c93ff
commit 5e77d2c875
7 changed files with 32 additions and 41 deletions

View File

@@ -1,6 +1,6 @@
dependencies: dependencies:
- name: postgresql - name: postgresql
repository: https://charts.bitnami.com/bitnami repository: oci://registry-1.docker.io/bitnamicharts
version: 8.10.14 version: 18.2.0
digest: sha256:db7c1e0bc9ec0ed45520521bd76bb390d04711fd0f04affaadafa1dc498ce68b digest: sha256:48f34138747ae0dfd6001f8d411957d2610cc4b0183ee082608c0a4becd615a4
generated: "2020-07-21T20:34:41.41180748-04:00" generated: "2025-12-30T19:25:41.865919231+03:00"

View File

@@ -2,10 +2,10 @@ apiVersion: v2
name: wikijs name: wikijs
# This is the chart version. This version number should be incremented each time you make changes # This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version. # to the chart and its templates, including the app version.
version: 2.3.20 version: 2.4.1
# This is the version number of the application being deployed. This version number should be # This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. # incremented each time you make changes to the application.
appVersion: 2.5.308 appVersion: 2.5.309
description: The most powerful and extensible open source Wiki software. description: The most powerful and extensible open source Wiki software.
keywords: keywords:
- wiki - wiki
@@ -23,20 +23,15 @@ keywords:
# a dependency of application charts to inject those utilities and functions into the rendering # a dependency of application charts to inject those utilities and functions into the rendering
# pipeline. Library charts do not define any templates and therefore cannot be deployed. # pipeline. Library charts do not define any templates and therefore cannot be deployed.
type: application type: application
dependencies:
- name: postgresql
version: 10.2.5
repository: https://charts.bitnami.com/bitnami
condition: postgresql.enabled
home: https://wiki.js.org home: https://wiki.js.org
icon: https://github.com/Requarks/wiki/raw/master/client/static/favicons/android-chrome-192x192.png icon: https://github.com/Requarks/wiki/raw/master/client/static/favicons/android-chrome-192x192.png
sources: sources:
- https://github.com/Requarks/wiki - https://github.com/Requarks/wiki
maintainers:
- name: Nicolas Giard
email: github@ngpixel.com
url: https://github.com/NGPixel
- name: James Greenhill
email: james@fuziontech.net
url: https://github.com/fuziontech
engine: gotpl engine: gotpl
dependencies:
- name: postgresql
condition: postgresql.enabled
repository: oci://registry-1.docker.io/bitnamicharts
version: 18.2.0

Binary file not shown.

Binary file not shown.

View File

@@ -81,7 +81,7 @@ Set postgres host
{{- if .Values.postgresql.enabled -}} {{- if .Values.postgresql.enabled -}}
{{- template "wiki.postgresql.fullname" . -}} {{- template "wiki.postgresql.fullname" . -}}
{{- else -}} {{- else -}}
{{- .Values.postgresql.postgresqlHost | quote -}} {{- .Values.postgresql.host | quote -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}
@@ -101,8 +101,8 @@ Set postgres secretKey
*/}} */}}
{{- define "wiki.postgresql.secretKey" -}} {{- define "wiki.postgresql.secretKey" -}}
{{- if .Values.postgresql.enabled -}} {{- if .Values.postgresql.enabled -}}
"postgresql-password" "password"
{{- else -}} {{- else -}}
{{- default "postgresql-password" .Values.postgresql.existingSecretKey | quote -}} {{- default "password" .Values.postgresql.auth.existingSecretKey | quote -}}
{{- end -}} {{- end -}}
{{- end -}} {{- end -}}

View File

@@ -25,36 +25,36 @@ spec:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
securityContext: securityContext:
{{- toYaml .Values.securityContext | nindent 12 }} {{- 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 }} imagePullPolicy: {{ default "IfNotPresent" .Values.image.imagePullPolicy }}
env: env:
- name: DB_TYPE - name: DB_TYPE
value: postgres value: postgres
- name: DB_HOST - name: DB_HOST
value: {{ template "wiki.postgresql.host" . }} value: {{ template "wiki.postgresql.host" . }}
- name: DB_SSL
value: "{{ default "false" .Values.postgresql.ssl }}"
- name: DB_PORT - 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 - name: DB_NAME
value: {{ default "wiki" .Values.postgresql.postgresqlDatabase }} value: {{ default "wiki" .Values.postgresql.auth.database }}
{{- if .Values.postgresql.enabled }} {{- if .Values.postgresql.enabled }}
- name: DB_USER - name: DB_USER
value: {{ default "wiki" .Values.postgresql.postgresqlUsername }} value: {{ default "wiki" .Values.postgresql.auth.username }}
- name: DB_PASS - name: DB_PASS
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:
{{- if .Values.postgresql.existingSecret }} {{- if .Values.postgresql.auth.existingSecret }}
name: {{ .Values.postgresql.existingSecret }} name: {{ .Values.postgresql.auth.existingSecret }}
{{- else }} {{- else }}
name: {{ template "wiki.postgresql.secret" . }} name: {{ template "wiki.postgresql.secret" . }}
{{- end }} {{- end }}
key: {{ template "wiki.postgresql.secretKey" . }} key: {{ template "wiki.postgresql.secretKey" . }}
{{- else }} {{- else }}
- name: DB_USER - name: DB_USER
value: {{ default "wiki" .Values.postgresql.postgresqlUsername }} value: {{ default "wiki" .Values.postgresql.auth.username }}
- name: DB_PASS - name: DB_PASS
value: {{ default "wiki" .Values.postgresql.postgresqlPassword }} value: {{ default "wiki" .Values.postgresql.auth.password }}
{{- end }} {{- end }}
ports: ports:
- name: http - name: http

View File

@@ -6,7 +6,7 @@ replicaCount: 1
image: image:
repository: requarks/wiki repository: requarks/wiki
tag: 2.5.308 tag: ""
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
imagePullSecrets: [] imagePullSecrets: []
@@ -75,16 +75,12 @@ tolerations: []
affinity: {} affinity: {}
# Enabled postgres # Enabled postgres
# ... for more options see https://github.com/bitnami/charts/tree/master/bitnami/postgresql
postgresql: postgresql:
# Set false for external PostgreSQL # Set false for external PostgreSQL
enabled: true enabled: true
postgresqlDatabase: wiki auth:
# username: "wiki"
# Set for external PostgreSQL host password: "wiki"
# postgresqlHost: postgresql database: "wiki"
#postgresqlUsername: postgres tls:
#postgresqlPassword: wiki
persistence:
enabled: false enabled: false
# storageClass: ""