From 4b0567833531ecadf60da27e7971a77f42938b2e Mon Sep 17 00:00:00 2001
From: Maximilian Ruta <mr@xtain.net>
Date: Sun, 17 Sep 2023 18:16:42 +0200
Subject: [PATCH] Healtcheck for available storage

---
 mailu/templates/fetchmail/deployment.yaml |  6 ++---
 mailu/templates/oletools/deployment.yaml  |  6 ++---
 mailu/templates/postfix/deployment.yaml   |  6 ++---
 mailu/templates/rspamd/deployment.yaml    | 24 ++++++++++++--------
 mailu/templates/webdav/deployment.yaml    |  6 ++---
 mailu/templates/webmail/deployment.yaml   | 27 ++++++++---------------
 6 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/mailu/templates/fetchmail/deployment.yaml b/mailu/templates/fetchmail/deployment.yaml
index f27354ea..606d2131 100644
--- a/mailu/templates/fetchmail/deployment.yaml
+++ b/mailu/templates/fetchmail/deployment.yaml
@@ -116,7 +116,7 @@ spec:
               command:
                 - sh
                 - -c
-                - 'ps ax | grep [/]fetchmail.py'
+                - 'ps ax | grep [/]fetchmail.py && df'
           {{- end }}
           {{- if .Values.fetchmail.livenessProbe.enabled }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.fetchmail.livenessProbe "enabled") "context" $) | nindent 12 }}
@@ -124,7 +124,7 @@ spec:
               command:
                 - sh
                 - -c
-                - 'ps ax | grep [/]fetchmail.py'
+                - 'ps ax | grep [/]fetchmail.py && df'
           {{- end }}
           {{- if .Values.fetchmail.readinessProbe.enabled }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.fetchmail.readinessProbe "enabled") "context" $) | nindent 12 }}
@@ -132,7 +132,7 @@ spec:
               command:
                 - sh
                 - -c
-                - 'ps ax | grep [/]fetchmail.py'
+                - 'ps ax | grep [/]fetchmail.py && df'
           {{- end }}
       volumes:
         - name: data
diff --git a/mailu/templates/oletools/deployment.yaml b/mailu/templates/oletools/deployment.yaml
index 849bdc25..f2ded800 100644
--- a/mailu/templates/oletools/deployment.yaml
+++ b/mailu/templates/oletools/deployment.yaml
@@ -106,7 +106,7 @@ spec:
               command:
                 - sh
                 - -c
-                - 'echo PING|nc -q1 localhost 11343|grep PONG'
+                - 'echo PING|nc -q1 localhost 11343|grep PONG && df'
           {{- end }}
           {{- if .Values.oletools.livenessProbe.enabled }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.oletools.livenessProbe "enabled") "context" $) | nindent 12 }}
@@ -114,7 +114,7 @@ spec:
               command:
                 - sh
                 - -c
-                - 'echo PING|nc -q1 localhost 11343|grep PONG'
+                - 'echo PING|nc -q1 localhost 11343|grep PONG && df'
           {{- end }}
           {{- if .Values.oletools.readinessProbe.enabled }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.oletools.readinessProbe "enabled") "context" $) | nindent 12 }}
@@ -122,7 +122,7 @@ spec:
               command:
                 - sh
                 - -c
-                - 'echo PING|nc -q1 localhost 11343|grep PONG'
+                - 'echo PING|nc -q1 localhost 11343|grep PONG && df'
           {{- end }}
       {{- if .Values.oletools.extraVolumes }}
       volumes:
diff --git a/mailu/templates/postfix/deployment.yaml b/mailu/templates/postfix/deployment.yaml
index 4a933f55..53f4b558 100644
--- a/mailu/templates/postfix/deployment.yaml
+++ b/mailu/templates/postfix/deployment.yaml
@@ -121,7 +121,7 @@ spec:
               command:
                 - sh
                 - -c
-                - '! /usr/libexec/postfix/master -t'
+                - '! /usr/libexec/postfix/master -t && df'
           {{- end }}
           {{- if .Values.postfix.livenessProbe.enabled }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.postfix.livenessProbe "enabled") "context" $) | nindent 12 }}
@@ -129,7 +129,7 @@ spec:
               command:
                 - sh
                 - -c
-                - '! /usr/libexec/postfix/master -t'
+                - '! /usr/libexec/postfix/master -t && df'
           {{- end }}
           {{- if .Values.postfix.readinessProbe.enabled }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.postfix.readinessProbe "enabled") "context" $) | nindent 12 }}
@@ -137,7 +137,7 @@ spec:
               command:
                 - sh
                 - -c
-                - '! /usr/libexec/postfix/master -t'
+                - '! /usr/libexec/postfix/master -t && df'
           {{- end }}
       volumes:
         - name: data
diff --git a/mailu/templates/rspamd/deployment.yaml b/mailu/templates/rspamd/deployment.yaml
index 89e5b61a..a9bb7e09 100644
--- a/mailu/templates/rspamd/deployment.yaml
+++ b/mailu/templates/rspamd/deployment.yaml
@@ -115,21 +115,27 @@ spec:
           {{- end }}
           {{- if .Values.rspamd.startupProbe.enabled }}
           startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.rspamd.startupProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: rspamd-http
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - 'curl --fail http://localhost:11334/ 2>&1 | grep "Rspamd" && df'
           {{- end }}
           {{- if .Values.rspamd.livenessProbe.enabled }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.rspamd.livenessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: rspamd-http
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - 'curl --fail http://localhost:11334/ 2>&1 | grep "Rspamd" && df'
           {{- end }}
           {{- if .Values.rspamd.readinessProbe.enabled }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.rspamd.readinessProbe "enabled") "context" $) | nindent 12 }}
-            httpGet:
-              path: /
-              port: rspamd-http
+            exec:
+              command:
+                - /bin/sh
+                - -c
+                - 'curl --fail http://localhost:11334/ 2>&1 | grep "Rspamd" && df'
           {{- end }}
       volumes:
         - name: data
diff --git a/mailu/templates/webdav/deployment.yaml b/mailu/templates/webdav/deployment.yaml
index 094ceef9..69ffae2a 100644
--- a/mailu/templates/webdav/deployment.yaml
+++ b/mailu/templates/webdav/deployment.yaml
@@ -109,7 +109,7 @@ spec:
               command:
                 - sh
                 - -c
-                - 'ps ax | grep [/]radicale.conf'
+                - 'ps ax | grep [/]radicale.conf && df'
           {{- end }}
           {{- if .Values.webdav.livenessProbe.enabled }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.webdav.livenessProbe "enabled") "context" $) | nindent 12 }}
@@ -117,7 +117,7 @@ spec:
               command:
                 - sh
                 - -c
-                - 'ps ax | grep [/]radicale.conf'
+                - 'ps ax | grep [/]radicale.conf && df'
           {{- end }}
           {{- if .Values.webdav.readinessProbe.enabled }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.webdav.readinessProbe "enabled") "context" $) | nindent 12 }}
@@ -125,7 +125,7 @@ spec:
               command:
                 - sh
                 - -c
-                - 'ps ax | grep [/]radicale.conf'
+                - 'ps ax | grep [/]radicale.conf && df'
           {{- end }}
       volumes:
         - name: data
diff --git a/mailu/templates/webmail/deployment.yaml b/mailu/templates/webmail/deployment.yaml
index 2f4e7430..3c36501e 100644
--- a/mailu/templates/webmail/deployment.yaml
+++ b/mailu/templates/webmail/deployment.yaml
@@ -107,34 +107,25 @@ spec:
           startupProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.webmail.startupProbe "enabled") "context" $) | nindent 12 }}
             exec:
               command:
-                - curl
-                - -f
-                - -L
-                - -H
-                - 'User-Agent: health'
-                - "http://localhost/ping"
+                - sh
+                - -c
+                - 'curl -f -L -H "User-Agent: health" http://localhost/ping && df'
           {{- end }}
           {{- if .Values.webmail.livenessProbe.enabled }}
           livenessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.webmail.livenessProbe "enabled") "context" $) | nindent 12 }}
             exec:
               command:
-                - curl
-                - -f
-                - -L
-                - -H
-                - 'User-Agent: health'
-                - "http://localhost/ping"
+                - sh
+                - -c
+                - 'curl -f -L -H "User-Agent: health" http://localhost/ping && df'
           {{- end }}
           {{- if .Values.webmail.readinessProbe.enabled }}
           readinessProbe: {{- include "common.tplvalues.render" (dict "value" (omit .Values.webmail.readinessProbe "enabled") "context" $) | nindent 12 }}
             exec:
               command:
-                - curl
-                - -f
-                - -L
-                - -H
-                - 'User-Agent: health'
-                - "http://localhost/ping"
+                - sh
+                - -c
+                - 'curl -f -L -H "User-Agent: health" http://localhost/ping && df'
           {{- end }}
       volumes:
         - name: data