fix(wikijs): fix usage of common lib

charts/wikijs/Chart.yaml

@@ -1,17 +1,15 @@
+---
 apiVersion: v2
 name: wikijs
 description: A modern, lightweight and powerful wiki app built on NodeJS.
 home: https://github.com/plcnk/charts/tree/master/charts/wikijs
 icon: https://raw.githubusercontent.com/plcnk/charts/master/charts/wikijs/icon.svg
 type: application
-version: 0.9.11
+version: 0.9.12
 # renovate datasource=docker depName=ghcr.io/requarks/wiki
-appVersion: "2.5.307"
+appVersion: 2.5.307
-kubeVersion: ">=1.22.0-0"
+kubeVersion: '>=1.22.0-0'
-keywords:
+keywords: [wikijs, wiki, documentation]
-  - wikijs
-  - wiki
-  - documentation
 dependencies:
   - name: common
     repository: https://bjw-s-labs.github.io/helm-charts
@@ -20,8 +18,7 @@ dependencies:
     repository: https://charts.bitnami.com/bitnami
     version: 16.7.21
     condition: postgresql.enabled
-sources:
+sources: [https://github.com/Requarks/wiki]
-  - https://github.com/Requarks/wiki
 annotations:
   artifacthub.io/changes: |-
     - kind: changed

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 . -}}
+{{- $_ := mergeOverwrite .Values (include "wikijs.hardcodedValues" . | fromYaml) -}}
-{{ include "bjw-s.common.loader.init" $tmplVars }}
-{{- $defaultValues := include "wikijs.harcodedValues" $tmplVars | fromYaml -}}
-{{- $_ := mustMerge .Values $defaultValues -}}
 
 {{/* Render the templates */}}
-{{ include "bjw-s.common.loader.init" . }}
 {{ include "bjw-s.common.loader.generate" . }}