From 9457f15b0436a9a962762bebd2cea248ae5db942 Mon Sep 17 00:00:00 2001
From: BenjaminJoerger <benjamin.joerger@maramalade.group>
Date: Wed, 20 Sep 2023 08:50:28 +0200
Subject: [PATCH] feat(Matomo): Respect extraEnv of matomo.cronjob.archive

---
 charts/matomo/templates/configmap.yaml       | 2 +-
 charts/matomo/templates/cronjob-archive.yaml | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/charts/matomo/templates/configmap.yaml b/charts/matomo/templates/configmap.yaml
index 975abfb..ca49caf 100644
--- a/charts/matomo/templates/configmap.yaml
+++ b/charts/matomo/templates/configmap.yaml
@@ -5,7 +5,7 @@ metadata:
   labels: {{- include "matomo.labels" . | nindent 4 }}
 data:
   php.ini: |
-    memory_limit={{ .Values.extraEnvs.PHP_MEMORY_LIMIT }}
+    memory_limit={{ default .Values.cronjobs.archive.extraEnvs.PHP_MEMORY_LIMIT .Values.extraEnvs.PHP_MEMORY_LIMIT }}
     mysqlnd.net_read_timeout={{ .Values.extraEnvs.MYSQLND_NET_READ_TIMEOUT }}
     default_socket_timeout={{ .Values.extraEnvs.DEFAULT_SOCKET_TIMEOUT }}
   matomo.conf: |
diff --git a/charts/matomo/templates/cronjob-archive.yaml b/charts/matomo/templates/cronjob-archive.yaml
index 5757855..54ae638 100644
--- a/charts/matomo/templates/cronjob-archive.yaml
+++ b/charts/matomo/templates/cronjob-archive.yaml
@@ -55,6 +55,10 @@ spec:
               - name: {{ $key }}
                 value: {{ $value | quote }}
             {{- end }}
+            {{- range $key, $value := .Values.cronjob.archive.extraEnvs }}
+              - name: {{ $key }}
+                value: {{ $value | quote }}
+            {{- end }}
             envFrom:
               - secretRef:
                   name: {{ include "matomo.fullname" . }}-envs