From 3462a1a93b30b34c9f3841a2bb020ebdd3841f60 Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Sun, 21 Jul 2024 23:03:36 +0200
Subject: [PATCH] fix(stalwart-mail): update AppVersion v0.8.5 + support probes

---
 stalwart-mail/Chart.yaml                |  4 +--
 stalwart-mail/README.adoc               | 39 +++++++++++++++++++++++--
 stalwart-mail/templates/deployment.yaml | 14 ++++++++-
 stalwart-mail/values.yaml               | 13 +++++++++
 4 files changed, 65 insertions(+), 5 deletions(-)

diff --git a/stalwart-mail/Chart.yaml b/stalwart-mail/Chart.yaml
index 41ddf09..87717d8 100644
--- a/stalwart-mail/Chart.yaml
+++ b/stalwart-mail/Chart.yaml
@@ -3,9 +3,9 @@ name: stalwart-mail
 description: Helm Chart for Stalwart Mail Server - Secure & Modern All-in-One Mail Server (IMAP, JMAP, SMTP)
 icon: https://stalw.art/home/apple-touch-icon.png
 type: application
-version: 0.0.10
+version: 0.0.11
 # renovate: image=docker.io/stalwartlabs/mail-server
-appVersion: "0.8.1"
+appVersion: "0.8.5"
 maintainers:
   - name: WrenIX
     url: https://wrenix.eu
diff --git a/stalwart-mail/README.adoc b/stalwart-mail/README.adoc
index ac015d4..aec8b93 100644
--- a/stalwart-mail/README.adoc
+++ b/stalwart-mail/README.adoc
@@ -2,9 +2,9 @@
 
 = stalwart-mail
 
-image::https://img.shields.io/badge/Version-0.0.10-informational?style=flat-square[Version: 0.0.10]
+image::https://img.shields.io/badge/Version-0.0.11-informational?style=flat-square[Version: 0.0.11]
 image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application]
-image::https://img.shields.io/badge/AppVersion-0.8.1-informational?style=flat-square[AppVersion: 0.8.1]
+image::https://img.shields.io/badge/AppVersion-0.8.5-informational?style=flat-square[AppVersion: 0.8.5]
 == Maintainers
 
 .Maintainers
@@ -159,6 +159,16 @@ helm uninstall stalwart-mail-release
 | `"internal"`
 |
 
+| config.server.listener.http.bind[0]
+| string
+| `"[::]:80"`
+|
+
+| config.server.listener.http.protocol
+| string
+| `"http"`
+|
+
 | config.server.listener.https.bind[0]
 | string
 | `"[::]:443"`
@@ -439,6 +449,16 @@ helm uninstall stalwart-mail-release
 | `[]`
 |
 
+| livenessProbe.httpGet.path
+| string
+| `"/healthz/live"`
+|
+
+| livenessProbe.httpGet.port
+| string
+| `"http"`
+|
+
 | nameOverride
 | string
 | `""`
@@ -499,6 +519,16 @@ helm uninstall stalwart-mail-release
 | `{}`
 |
 
+| readinessProbe.httpGet.path
+| string
+| `"/healthz/ready"`
+|
+
+| readinessProbe.httpGet.port
+| string
+| `"http"`
+|
+
 | replicaCount
 | int
 | `1`
@@ -529,6 +559,11 @@ helm uninstall stalwart-mail-release
 | `"SingleStack"`
 | other option is RequireDualStack
 
+| service.ports.http
+| int
+| `80`
+|
+
 | service.ports.https
 | int
 | `443`
diff --git a/stalwart-mail/templates/deployment.yaml b/stalwart-mail/templates/deployment.yaml
index 9aee1cd..b89f5e1 100644
--- a/stalwart-mail/templates/deployment.yaml
+++ b/stalwart-mail/templates/deployment.yaml
@@ -36,7 +36,7 @@ spec:
         - name: {{ .Chart.Name }}
           securityContext:
             {{- toYaml .Values.securityContext | nindent 12 }}
-          {{- with .Values.image}}
+          {{- with .Values.image }}
           image: "{{ coalesce $.Values.global.image.registry .registry }}/{{ .repository }}:{{ .tag | default (printf "v%s" $.Chart.AppVersion) }}"
           imagePullPolicy: {{ coalesce $.Values.global.image.pullPolicy .pullPolicy }}
           {{- end }}
@@ -53,6 +53,18 @@ spec:
               containerPort: {{ $port }}
               protocol: TCP
             {{- end }}
+          {{- with .Values.livenessProbe }}
+          livenessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.readinessProbe }}
+          livenessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
+          {{- with .Values.startupProbe }}
+          livenessProbe:
+            {{- toYaml . | nindent 12 }}
+          {{- end }}
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
           volumeMounts:
diff --git a/stalwart-mail/values.yaml b/stalwart-mail/values.yaml
index 0259502..9932801 100644
--- a/stalwart-mail/values.yaml
+++ b/stalwart-mail/values.yaml
@@ -54,6 +54,9 @@ config:
       sieve:
         bind: ["[::]:4190"]
         protocol: "managesieve"
+      http:
+        protocol: "http"
+        bind: ["[::]:80"]
       https:
         protocol: "http"
         bind: ["[::]:443"]
@@ -163,8 +166,18 @@ service:
     pop3: 110
     pop3s: 995
     sieve: 4190
+    http: 80
     https: 443
 
+livenessProbe:
+  httpGet:
+    path: /healthz/live
+    port: http
+readinessProbe:
+  httpGet:
+    path: /healthz/ready
+    port: http
+
 ingress:
   enabled: false
   className: ""