fix(wikijs): fix usage of common lib

* chore(deps): update cloudflare/cloudflared docker tag to v2025.8.0

* chore: Update chart metadata

---------

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: plcnk-bot <178334506+plcnk-bot[bot]@users.noreply.github.com>

charts/cloudflare-tunnel/Chart.yaml

@@ -4,9 +4,9 @@ description: Connect your resources to Cloudflare without a publicly routable IP
 home: https://github.com/plcnk/charts/tree/master/charts/cloudflare-tunnel
 icon: https://raw.githubusercontent.com/plcnk/charts/master/charts/cloudflare-tunnel/icon.svg
 type: application
-version: 0.12.0
+version: 0.13.0
 # renovate datasource=docker depName=cloudflare/cloudflared
-appVersion: "2025.7.0"
+appVersion: "2025.8.0"
 kubeVersion: ">=1.22.0-0"
 keywords:
   - cloudflared
@@ -22,7 +22,7 @@ sources:
 annotations:
   artifacthub.io/changes: |-
     - kind: changed
-      description: Update cloudflare/cloudflared docker tag to v2025.7.0
+      description: Update cloudflare/cloudflared docker tag to v2025.8.0
   artifacthub.io/links: |-
     - name: App Source
       url: https://github.com/cloudflare/cloudflared

charts/cloudflare-tunnel/README.md

@@ -2,16 +2,16 @@
 
 <img src="https://raw.githubusercontent.com/plcnk/charts/master/charts/cloudflare-tunnel/icon.svg" align="right" width="92" alt="cloudflare-tunnel logo">
 
-![Version: 0.12.0](https://img.shields.io/badge/Version-0.12.0-informational?style=flat)
+![Version: 0.13.0](https://img.shields.io/badge/Version-0.13.0-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
-![AppVersion: 2025.7.0](https://img.shields.io/badge/AppVersion-2025.7.0-informational?style=flat)
+![AppVersion: 2025.8.0](https://img.shields.io/badge/AppVersion-2025.8.0-informational?style=flat)
 
 Connect your resources to Cloudflare without a publicly routable IP address.
 
 **Homepage:** <https://github.com/plcnk/charts/tree/master/charts/cloudflare-tunnel>
 
 **This chart is not maintained by the upstream project and any issues with the chart should be raised
-[here](https://github.com/plcnk/charts/issues/new?assignees=plcnk&labels=bug&template=bug_report.yaml&name=cloudflare-tunnel&version=0.12.0)**
+[here](https://github.com/plcnk/charts/issues/new?assignees=plcnk&labels=bug&template=bug_report.yaml&name=cloudflare-tunnel&version=0.13.0)**
 
 ## Source Code
 
@@ -89,7 +89,7 @@ helm install cloudflare-tunnel plcnk/cloudflare-tunnel -f values.yaml
 | controllers.main.containers.app.env | object | See [values.yaml](./values.yaml) | Environment variables |
 | controllers.main.containers.app.image.pullPolicy | string | `"IfNotPresent"` | Image pull policy |
 | controllers.main.containers.app.image.repository | string | `"cloudflare/cloudflared"` | Image repository |
-| controllers.main.containers.app.image.tag | string | `"2025.7.0"` | Image tag |
+| controllers.main.containers.app.image.tag | string | `"2025.8.0"` | Image tag |
 | controllers.main.containers.app.securityContext.allowPrivilegeEscalation | bool | `false` | Disable privilege escalations |
 | controllers.main.containers.app.securityContext.capabilities | object | `{"drop":["ALL"]}` | Drop all capabilities |
 | controllers.main.containers.app.securityContext.readOnlyRootFilesystem | bool | `true` | Mount the container's root filesystem as read-only |

charts/cloudflare-tunnel/values.yaml

@@ -20,7 +20,7 @@ controllers:
           # -- Image pull policy
           pullPolicy: IfNotPresent
           # -- Image tag
-          tag: 2025.7.0
+          tag: 2025.8.0
 
         # -- Environment variables
         # @default -- See [values.yaml](./values.yaml)

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"
-kubeVersion: ">=1.22.0-0"
-keywords:
-  - wikijs
-  - wiki
-  - documentation
+appVersion: 2.5.307
+kubeVersion: '>=1.22.0-0'
+keywords: [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:
-  - https://github.com/Requarks/wiki
+sources: [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 . -}}
-{{ 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" . }}