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>

.github/ct-install-config.yaml

@@ -1,5 +1,5 @@
 debug: true
 all: true
 chart-repos:
-  - bjw-s=https://bjw-s.github.io/helm-charts
+  - bjw-s=https://bjw-s-labs.github.io/helm-charts
   - bitnami=https://charts.bitnami.com/bitnami

.github/ct-lint-config.yaml

@@ -2,5 +2,5 @@ debug: true
 all: true
 validate-maintainers: false
 chart-repos:
-  - bjw-s=https://bjw-s.github.io/helm-charts
+  - bjw-s=https://bjw-s-labs.github.io/helm-charts
   - bitnami=https://charts.bitnami.com/bitnami

.github/renovate.json5

@@ -11,8 +11,8 @@
   customManagers: [
     {
       customType: 'regex',
-      fileMatch: [
-        '\\.yaml$',
+      managerFilePatterns: [
+        '/\\.yaml$/',
       ],
       matchStrings: [
         '# ?renovate datasource=(?<datasource>.+?) depName=(?<depName>.+)\\n.+: ["\']?(?<currentValue>.+?)["\']?\\n',

.github/workflows/release.yaml

@@ -45,7 +45,7 @@ jobs:
 
       - name: Add Helm repos
         run: |
-          helm repo add bjw-s https://bjw-s.github.io/helm-charts
+          helm repo add bjw-s https://bjw-s-labs.github.io/helm-charts
           helm repo add bitnami https://charts.bitnami.com/bitnami
 
       - name: Install chart-releaser

charts/cloudflare-tunnel/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
-  repository: https://bjw-s.github.io/helm-charts
+  repository: https://bjw-s-labs.github.io/helm-charts
   version: 3.3.2
-digest: sha256:5a0f9f06aa383b7cc3070899b879401bcd4ae48b021d0a2b7f9ba39827019e24
-generated: "2024-08-20T23:20:57.06668901+02:00"
+digest: sha256:47e8b695b3e6ca391b4810525f318806b36aadb5ad76a5856a1ecca973029b6a
+generated: "2025-05-09T11:34:23.380031+02:00"

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.8.0
+version: 0.13.0
 # renovate datasource=docker depName=cloudflare/cloudflared
-appVersion: "2025.4.0"
+appVersion: "2025.8.0"
 kubeVersion: ">=1.22.0-0"
 keywords:
   - cloudflared
@@ -15,14 +15,14 @@ keywords:
   - tunnel
 dependencies:
   - name: common
-    repository: https://bjw-s.github.io/helm-charts
+    repository: https://bjw-s-labs.github.io/helm-charts
     version: 3.3.2
 sources:
   - https://github.com/cloudflare/cloudflared
 annotations:
   artifacthub.io/changes: |-
     - kind: changed
-      description: Update cloudflare/cloudflared docker tag to v2025.4.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.8.0](https://img.shields.io/badge/Version-0.8.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.4.0](https://img.shields.io/badge/AppVersion-2025.4.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.8.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
 
@@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| <https://bjw-s.github.io/helm-charts> | common | 3.3.2 |
+| <https://bjw-s-labs.github.io/helm-charts> | common | 3.3.2 |
 
 ## Installing the Chart
 
@@ -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.4.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.4.0
+          tag: 2025.8.0
 
         # -- Environment variables
         # @default -- See [values.yaml](./values.yaml)

charts/it-tools/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
-  repository: https://bjw-s.github.io/helm-charts
+  repository: https://bjw-s-labs.github.io/helm-charts
   version: 3.3.2
-digest: sha256:5a0f9f06aa383b7cc3070899b879401bcd4ae48b021d0a2b7f9ba39827019e24
-generated: "2024-08-15T17:47:53.312594+02:00"
+digest: sha256:47e8b695b3e6ca391b4810525f318806b36aadb5ad76a5856a1ecca973029b6a
+generated: "2025-05-09T11:35:40.935162+02:00"

charts/it-tools/Chart.yaml

@@ -4,7 +4,7 @@ description: Collection of handy online tools for developers, with great UX.
 home: https://github.com/plcnk/charts/tree/master/charts/it-tools
 icon: https://raw.githubusercontent.com/plcnk/charts/master/charts/it-tools/icon.svg
 type: application
-version: 2.1.2
+version: 2.2.0
 # renovate datasource=docker depName=ghcr.io/corentinth/it-tools
 appVersion: "2024.10.22-7ca5933"
 kubeVersion: ">=1.22.0-0"
@@ -14,14 +14,14 @@ keywords:
   - tools
 dependencies:
   - name: common
-    repository: https://bjw-s.github.io/helm-charts
+    repository: https://bjw-s-labs.github.io/helm-charts
     version: 3.3.2
 sources:
   - https://github.com/CorentinTh/it-tools
 annotations:
   artifacthub.io/changes: |-
     - kind: added
-      description: Update ghcr.io/corentinth/it-tools docker tag to 2024.10.22-7ca5933
+      description: Update bjw-s chart link
   artifacthub.io/links: |-
     - name: App Source
       url: https://github.com/CorentinTh/it-tools

charts/it-tools/README.md

@@ -2,7 +2,7 @@
 
 <img src="https://raw.githubusercontent.com/plcnk/charts/master/charts/it-tools/icon.svg" align="right" width="92" alt="it-tools logo">
 
-![Version: 2.1.2](https://img.shields.io/badge/Version-2.1.2-informational?style=flat)
+![Version: 2.2.0](https://img.shields.io/badge/Version-2.2.0-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
 ![AppVersion: 2024.10.22-7ca5933](https://img.shields.io/badge/AppVersion-2024.10.22--7ca5933-informational?style=flat)
 
@@ -11,7 +11,7 @@ Collection of handy online tools for developers, with great UX.
 **Homepage:** <https://github.com/plcnk/charts/tree/master/charts/it-tools>
 
 **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=it-tools&version=2.1.2)**
+[here](https://github.com/plcnk/charts/issues/new?assignees=plcnk&labels=bug&template=bug_report.yaml&name=it-tools&version=2.2.0)**
 
 ## Source Code
 
@@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| <https://bjw-s.github.io/helm-charts> | common | 3.3.2 |
+| <https://bjw-s-labs.github.io/helm-charts> | common | 3.3.2 |
 
 ## Installing the Chart
 

charts/moodist/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
-  repository: https://bjw-s.github.io/helm-charts
+  repository: https://bjw-s-labs.github.io/helm-charts
   version: 3.3.2
-digest: sha256:5a0f9f06aa383b7cc3070899b879401bcd4ae48b021d0a2b7f9ba39827019e24
-generated: "2024-08-17T11:26:39.224544+02:00"
+digest: sha256:47e8b695b3e6ca391b4810525f318806b36aadb5ad76a5856a1ecca973029b6a
+generated: "2025-05-09T11:36:40.921049+02:00"

charts/moodist/Chart.yaml

@@ -4,9 +4,9 @@ description: Ambient sounds for focus and calm.
 home: https://github.com/plcnk/charts/tree/master/charts/moodist
 icon: https://raw.githubusercontent.com/plcnk/charts/master/charts/moodist/icon.svg
 type: application
-version: 0.2.0
+version: 0.4.0
 # renovate datasource=docker depName=ghcr.io/remvze/moodist
-appVersion: "v2.0.1"
+appVersion: "v2.1.0"
 kubeVersion: ">=1.22.0-0"
 keywords:
   - ambient
@@ -16,14 +16,14 @@ keywords:
   - focus
 dependencies:
   - name: common
-    repository: https://bjw-s.github.io/helm-charts
+    repository: https://bjw-s-labs.github.io/helm-charts
     version: 3.3.2
 sources:
   - https://github.com/remvze/moodist
 annotations:
   artifacthub.io/changes: |-
     - kind: changed
-      description: Update ghcr.io/remvze/moodist docker tag to v2
+      description: Update ghcr.io/remvze/moodist docker tag to v2.1.0
   artifacthub.io/links: |-
     - name: App Source
       url: https://github.com/remvze/moodist

charts/moodist/README.md

@@ -2,16 +2,16 @@
 
 <img src="https://raw.githubusercontent.com/plcnk/charts/master/charts/moodist/icon.svg" align="right" width="92" alt="moodist logo">
 
-![Version: 0.2.0](https://img.shields.io/badge/Version-0.2.0-informational?style=flat)
+![Version: 0.4.0](https://img.shields.io/badge/Version-0.4.0-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
-![AppVersion: v2.0.1](https://img.shields.io/badge/AppVersion-v2.0.1-informational?style=flat)
+![AppVersion: v2.1.0](https://img.shields.io/badge/AppVersion-v2.1.0-informational?style=flat)
 
 Ambient sounds for focus and calm.
 
 **Homepage:** <https://github.com/plcnk/charts/tree/master/charts/moodist>
 
 **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=moodist&version=0.2.0)**
+[here](https://github.com/plcnk/charts/issues/new?assignees=plcnk&labels=bug&template=bug_report.yaml&name=moodist&version=0.4.0)**
 
 ## Source Code
 
@@ -25,7 +25,7 @@ Kubernetes: `>=1.22.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| <https://bjw-s.github.io/helm-charts> | common | 3.3.2 |
+| <https://bjw-s-labs.github.io/helm-charts> | common | 3.3.2 |
 
 ## Installing the Chart
 
@@ -87,7 +87,7 @@ N/A
 | 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 | `"ghcr.io/remvze/moodist"` | Image repository |
-| controllers.main.containers.app.image.tag | string | `"v2.0.1"` | Image tag |
+| controllers.main.containers.app.image.tag | string | `"v2.1.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/moodist/values.yaml

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

charts/wikijs/Chart.lock

@@ -1,9 +1,9 @@
 dependencies:
 - name: common
-  repository: https://bjw-s.github.io/helm-charts
+  repository: https://bjw-s-labs.github.io/helm-charts
   version: 3.3.2
 - name: postgresql
   repository: https://charts.bitnami.com/bitnami
-  version: 16.6.4
-digest: sha256:1d3401a342b3e75e323febe5e1f82296f20422f80595843a43aeec4d15c83580
-generated: "2025-04-23T23:16:05.768811103Z"
+  version: 16.7.21
+digest: sha256:ca35fe8bacdc9e7f3b445202d2655a7520ce5464ac54e1c7182dc17c06b47e8f
+generated: "2025-07-22T02:35:11.301799448Z"

charts/wikijs/Chart.yaml

@@ -1,31 +1,28 @@
+---
 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.8.3
+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.github.io/helm-charts
+    repository: https://bjw-s-labs.github.io/helm-charts
     version: 3.3.2
   - name: postgresql
     repository: https://charts.bitnami.com/bitnami
-    version: 16.6.4
+    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
-      description: Update postgresql helm release to v16.6.4
+      description: Update postgresql helm release to v16.7.21
   artifacthub.io/links: |-
     - name: App Source
       url: https://github.com/Requarks/wiki

charts/wikijs/README.md

@@ -2,7 +2,7 @@
 
 <img src="https://raw.githubusercontent.com/plcnk/charts/master/charts/wikijs/icon.svg" align="right" width="92" alt="wikijs logo">
 
-![Version: 0.8.3](https://img.shields.io/badge/Version-0.8.3-informational?style=flat)
+![Version: 0.9.11](https://img.shields.io/badge/Version-0.9.11-informational?style=flat)
 ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat)
 ![AppVersion: 2.5.307](https://img.shields.io/badge/AppVersion-2.5.307-informational?style=flat)
 
@@ -11,7 +11,7 @@ A modern, lightweight and powerful wiki app built on NodeJS.
 **Homepage:** <https://github.com/plcnk/charts/tree/master/charts/wikijs>
 
 **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=wikijs&version=0.8.3)**
+[here](https://github.com/plcnk/charts/issues/new?assignees=plcnk&labels=bug&template=bug_report.yaml&name=wikijs&version=0.9.11)**
 
 ## Source Code
 
@@ -25,8 +25,8 @@ Kubernetes: `>=1.22.0-0`
 
 | Repository | Name | Version |
 |------------|------|---------|
-| <https://bjw-s.github.io/helm-charts> | common | 3.3.2 |
-| <https://charts.bitnami.com/bitnami> | postgresql | 16.6.4 |
+| <https://bjw-s-labs.github.io/helm-charts> | common | 3.3.2 |
+| <https://charts.bitnami.com/bitnami> | postgresql | 16.7.21 |
 
 ## Installing the Chart
 

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" . }}

hack/templates/README.md.gotmpl

@@ -87,7 +87,7 @@ The command removes all the Kubernetes components associated with the chart **in
 {{- define "custom.bjwsRef" -}}
 {{- $ref := "" -}}
 {{- range .Dependencies -}}
-{{- if and (eq .Repository "https://bjw-s.github.io/helm-charts") (eq .Name "common") (semverCompare "^1.x" .Version) -}}
+{{- if and (eq .Repository "https://bjw-s-labs.github.io/helm-charts") (eq .Name "common") (semverCompare "^1.x" .Version) -}}
 {{- $ref = "a081de5" -}}
 {{- end -}}
 {{- end -}}