From fc93db0404297d794a010c76e80d3ae7e0459128 Mon Sep 17 00:00:00 2001
From: Juan Ariza Toledano <jariza@vmware.com>
Date: Tue, 13 Aug 2024 13:01:52 +0200
Subject: [PATCH] [bitnami/matomo] Increase readiness probes' initial delay for
 VIB tests (#28847)

---
 .vib/matomo/runtime-parameters.yaml   |  2 +-
 bitnami/matomo/CHANGELOG.md           |  8 ++++++--
 bitnami/matomo/Chart.lock             |  6 +++---
 bitnami/matomo/Chart.yaml             |  2 +-
 bitnami/matomo/templates/_helpers.tpl | 10 ++++++----
 5 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/.vib/matomo/runtime-parameters.yaml b/.vib/matomo/runtime-parameters.yaml
index 391602774c34a6..e4ad7eddd21a8b 100644
--- a/.vib/matomo/runtime-parameters.yaml
+++ b/.vib/matomo/runtime-parameters.yaml
@@ -7,7 +7,7 @@ service:
   ports:
     http: 80
 readinessProbe:
-  initialDelaySeconds: 90
+  initialDelaySeconds: 120
 cronjobs:
   archive:
     enabled: false
diff --git a/bitnami/matomo/CHANGELOG.md b/bitnami/matomo/CHANGELOG.md
index 390c929a37a2a5..77599f7230ca10 100644
--- a/bitnami/matomo/CHANGELOG.md
+++ b/bitnami/matomo/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Changelog
 
-## 8.0.6 (2024-08-05)
+## 8.0.7 (2024-08-13)
 
-* [bitnami/matomo] Remove dokuwiki reference ([#28661](https://github.com/bitnami/charts/pull/28661))
+* [bitnami/matomo] Increase readiness probes' initial delay for VIB tests ([#28847](https://github.com/bitnami/charts/pull/28847))
+
+## <small>8.0.6 (2024-08-05)</small>
+
+* [bitnami/matomo] Remove dokuwiki reference (#28661) ([e786767](https://github.com/bitnami/charts/commit/e786767a8aaabefd3dc8d834a5176ca5bde3bbc9)), closes [#28661](https://github.com/bitnami/charts/issues/28661)
 
 ## <small>8.0.5 (2024-07-25)</small>
 
diff --git a/bitnami/matomo/Chart.lock b/bitnami/matomo/Chart.lock
index fde47ac1b2c72a..609b4951e52ccc 100644
--- a/bitnami/matomo/Chart.lock
+++ b/bitnami/matomo/Chart.lock
@@ -4,6 +4,6 @@ dependencies:
   version: 19.0.3
 - name: common
   repository: oci://registry-1.docker.io/bitnamicharts
-  version: 2.20.5
-digest: sha256:bdb3bb68e405ddb99a5ca3861b3600439252bd1fa7e47301807c0cb13be89fc2
-generated: "2024-07-25T08:56:54.795024752Z"
+  version: 2.22.0
+digest: sha256:b177642b18397ccf1120d5bea4a729de766977e0da59a8dfd67152d884afb578
+generated: "2024-08-13T09:55:30.679206+02:00"
diff --git a/bitnami/matomo/Chart.yaml b/bitnami/matomo/Chart.yaml
index 96d33df8b4ed85..0dbc7a803e466a 100644
--- a/bitnami/matomo/Chart.yaml
+++ b/bitnami/matomo/Chart.yaml
@@ -39,4 +39,4 @@ maintainers:
 name: matomo
 sources:
 - https://github.com/bitnami/charts/tree/main/bitnami/matomo
-version: 8.0.6
+version: 8.0.7
diff --git a/bitnami/matomo/templates/_helpers.tpl b/bitnami/matomo/templates/_helpers.tpl
index e6848b66a82baa..839391dc8f2212 100644
--- a/bitnami/matomo/templates/_helpers.tpl
+++ b/bitnami/matomo/templates/_helpers.tpl
@@ -152,11 +152,12 @@ Return the matomo pods needed initContainers
   image: {{ include "matomo.volumePermissions.image" . }}
   imagePullPolicy: {{ .Values.volumePermissions.image.pullPolicy | quote }}
   command:
-    - sh
-    - -c
+    - /bin/bash
+  args:
+    - -ec
     - |
-      mkdir -p "/bitnami/matomo"
-      chown -R "{{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.podSecurityContext.fsGroup }}" "/bitnami/matomo"
+      mkdir -p /bitnami/matomo
+      find /bitnami/matomo -mindepth 0 -maxdepth 1 -not -name ".snapshot" -not -name "lost+found" | xargs -r chown -R {{ .Values.containerSecurityContext.runAsUser }}:{{ .Values.podSecurityContext.fsGroup }}
   securityContext:
     runAsUser: 0
   {{- if .Values.volumePermissions.resources }}
@@ -216,6 +217,7 @@ Return the matomo pods needed initContainers
       readOnly: true
 {{- end }}
 {{- end }}
+
 {{/*
 Return if cronjob X is enabled. Takes into account the deprecated value 'cronjobs.enabled'.
 Use: include "matomo.cronjobs.enabled" (dict "context" $ "cronjob" "archive" )