..

Author: audacioustux

charts/mautic/Chart.yaml

@@ -18,7 +18,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 5.1.96
+version: 5.1.97
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/mautic/templates/cronjob.yaml

@@ -336,4 +336,57 @@ spec:
           restartPolicy: OnFailure
           volumes:
             {{- include "mautic.volumes" . | nindent 12 }}
+{{- end }}
+---
+# messenger:consume email
+{{- if .Values.mautic.cron.messengerConsumeEmail.enabled }}
+kind: CronJob
+apiVersion: batch/v1
+metadata:
+  name: {{ include "mautic.fullname" . }}-messenger-consume-email
+  labels:
+    {{- include "mautic.labels" . | nindent 4 }}
+spec:
+  concurrencyPolicy: Forbid
+  schedule: "{{ .Values.mautic.cron.messengerConsumeEmail.schedule }}"
+  successfulJobsHistoryLimit: 1
+  jobTemplate:
+    spec:
+      template:
+        spec:
+          containers:
+          - name: console
+            image: "{{ .Values.mautic.image.repository }}:console-{{ .Values.mautic.image.tag }}"
+            imagePullPolicy: "{{ .Values.mautic.image.pullPolicy }}"
+            args:
+              - messenger:consume
+              - email
+              {{- if .Values.mautic.cron.messengerConsumeEmail.debug }}
+              - -vv
+              {{- end }}
+              {{- if .Values.mautic.cron.messengerConsumeEmail.limit }}
+              - --limit
+              - "{{ .Values.mautic.cron.messengerConsumeEmail.limit }}"
+              {{- end }}
+              {{- if .Values.mautic.cron.messengerConsumeEmail.timeLimit }}
+              - --time-limit
+              - "{{ .Values.mautic.cron.messengerConsumeEmail.timeLimit }}"
+              {{- end }}
+              {{- if .Values.mautic.cron.messengerConsumeEmail.memoryLimit }}
+              - --memory-limit
+              - "{{ .Values.mautic.cron.messengerConsumeEmail.memoryLimit }}"
+              {{- end }}
+            envFrom:
+              {{- include "mautic.envFrom" . | nindent 14 }}
+            {{- if .Values.mautic.cron.messengerConsumeEmail.env }}
+            env:
+              {{- toYaml .Values.mautic.cron.messengerConsumeEmail.env | nindent 14 }}
+            {{- end }}
+            volumeMounts:
+              {{- include "mautic.volumeMounts" . | nindent 14 }}
+            resources:
+              {{- toYaml .Values.mautic.cron.messengerConsumeEmail.resources | nindent 14 }}
+          restartPolicy: OnFailure
+          volumes:
+            {{- include "mautic.volumes" . | nindent 12 }}
 {{- end }}

charts/mautic/values.yaml

@@ -155,10 +155,16 @@ mautic:
       enabled: true
       schedule: "*/1 * * * *"
       resources: *cron_resources
+    messengerConsumeEmail:
+      enabled: true
+      schedule: "*/1 * * * *"
+      resources: *cron_resources
+      memoryLimit: "256M"
+      limit: 120
 
   messenger:
     consumeEmail:
-      enabled: true
+      enabled: false
       resources: &message_resources
         limits:
           memory: 512Mi