From 533c8a6b32a92def0fbfaffa344b776fa6209e3e Mon Sep 17 00:00:00 2001 From: bp99 Date: Sun, 18 Jan 2026 00:55:24 +0100 Subject: [PATCH] fix(wikijs): fix usage of common lib --- charts/wikijs/templates/common.yaml | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/charts/wikijs/templates/common.yaml b/charts/wikijs/templates/common.yaml index 9a13270..b8d48c9 100644 --- a/charts/wikijs/templates/common.yaml +++ b/charts/wikijs/templates/common.yaml @@ -1,3 +1,5 @@ +{{ include "bjw-s.common.loader.init" . }} + {{/* Append the hardcoded settings */}} {{- define "wikijs.harcodedValues" -}} persistence: @@ -72,11 +74,7 @@ controllers: {{- end -}} -{{- $tmplVars := deepCopy . -}} -{{ include "bjw-s.common.loader.init" $tmplVars }} -{{- $defaultValues := include "wikijs.harcodedValues" $tmplVars | fromYaml -}} -{{- $_ := mustMerge .Values $defaultValues -}} +{{- $_ := mergeOverwrite .Values (include "wikijs.hardcodedValues" . | fromYaml) -}} {{/* Render the templates */}} -{{ include "bjw-s.common.loader.init" . }} {{ include "bjw-s.common.loader.generate" . }}