Skip to content

fix(docmost): centralize template validation #659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mberlofa merged 2 commits into from
Jul 6, 2026
Merged

fix(docmost): centralize template validation #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddb70f7
fix(docmost): centralize template validation
Jul 3, 2026
fe069f9
fix(docmost): reject unsupported storage modes
Jul 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions charts/docmost/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,3 +254,21 @@ true
{{- define "docmost.backupDbPasswordSecretKey" -}}
{{- include "docmost.databaseSecretKey" . -}}
{{- end -}}

{{- define "docmost.validate" -}}
{{- if and (ne .Values.storage.mode "local") (ne .Values.storage.mode "s3") -}}
{{- fail (printf "docmost: storage.mode must be 'local' or 's3', got %q" .Values.storage.mode) -}}
{{- end -}}
{{- if and (ne (int .Values.replicaCount) 1) (ne .Values.storage.mode "s3") -}}
{{- fail "docmost: replicaCount greater than 1 requires storage.mode=s3 because local storage is single-writer" -}}
{{- end -}}
{{- if and (eq .Values.storage.mode "local") (not .Values.storage.local.enabled) (not .Values.storage.local.existingClaim) -}}
{{- fail "docmost: storage.mode=local requires storage.local.enabled=true or storage.local.existingClaim" -}}
{{- end -}}
{{- if and (eq .Values.storage.mode "s3") (not .Values.storage.s3.bucket) -}}
{{- fail "docmost: storage.mode=s3 requires storage.s3.bucket" -}}
{{- end -}}
{{- if and (eq .Values.storage.mode "s3") (not .Values.storage.s3.existingSecret) (or (not .Values.storage.s3.accessKey) (not .Values.storage.s3.secretKey)) -}}
{{- fail "docmost: storage.mode=s3 requires storage.s3.existingSecret or both storage.s3.accessKey and storage.s3.secretKey" -}}
{{- end -}}
{{- end -}}
13 changes: 1 addition & 12 deletions charts/docmost/templates/validate.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,2 @@
{{/* SPDX-License-Identifier: Apache-2.0 */}}
{{- if and (ne (int .Values.replicaCount) 1) (ne .Values.storage.mode "s3") -}}
{{- fail "docmost: replicaCount greater than 1 requires storage.mode=s3 because local storage is single-writer" -}}
{{- end -}}
{{- if and (eq .Values.storage.mode "local") (not .Values.storage.local.enabled) (not .Values.storage.local.existingClaim) -}}
{{- fail "docmost: storage.mode=local requires storage.local.enabled=true or storage.local.existingClaim" -}}
{{- end -}}
{{- if and (eq .Values.storage.mode "s3") (not .Values.storage.s3.bucket) -}}
{{- fail "docmost: storage.mode=s3 requires storage.s3.bucket" -}}
{{- end -}}
{{- if and (eq .Values.storage.mode "s3") (not .Values.storage.s3.existingSecret) (or (not .Values.storage.s3.accessKey) (not .Values.storage.s3.secretKey)) -}}
{{- fail "docmost: storage.mode=s3 requires storage.s3.existingSecret or both storage.s3.accessKey and storage.s3.secretKey" -}}
{{- end -}}
{{- include "docmost.validate" . -}}