From ae9b39bb321054a5cbdc11ca8cfe3fd42e478a7e Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Mon, 27 Nov 2023 00:42:58 +0100
Subject: [PATCH] fix(mok): Also fix startup probe to drop supervisord

---
 charts/mok/Chart.yaml                                | 2 +-
 charts/mok/README.md                                 | 2 +-
 charts/mok/templates/postfix.yaml                    | 1 -
 charts/mok/tests/__snapshot__/postfix_test.yaml.snap | 2 +-
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/charts/mok/Chart.yaml b/charts/mok/Chart.yaml
index 7ce77e8a5..c2515f759 100644
--- a/charts/mok/Chart.yaml
+++ b/charts/mok/Chart.yaml
@@ -3,7 +3,7 @@ name: mok
 description: |
   Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
 type: application
-version: 0.10.3
+version: 0.10.4
 sources:
   - https://de.postfix.org/ftpmirror/index.html
   - https://github.com/dovecot/core
diff --git a/charts/mok/README.md b/charts/mok/README.md
index 7f72d23b1..9e5a8097f 100644
--- a/charts/mok/README.md
+++ b/charts/mok/README.md
@@ -1,6 +1,6 @@
 # mok
 
-![Version: 0.10.3](https://img.shields.io/badge/Version-0.10.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
+![Version: 0.10.4](https://img.shields.io/badge/Version-0.10.4-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square)
 
 Mail on Kubernetes (MoK) is a project to deploy a functional mailserver that runs without a database server on Kubernetes, taking advantage of configmaps and secret.
 
diff --git a/charts/mok/templates/postfix.yaml b/charts/mok/templates/postfix.yaml
index 81be0a025..5426c8161 100644
--- a/charts/mok/templates/postfix.yaml
+++ b/charts/mok/templates/postfix.yaml
@@ -195,7 +195,6 @@ spec:
                 - sh
                 - -c
                 - >-
-                  ps axf | fgrep -v grep | fgrep -q "supervisord" &&
                   ps axf | fgrep -v grep | fgrep -q "/usr/libexec/postfix/master"
           ports:
             - containerPort: 25
diff --git a/charts/mok/tests/__snapshot__/postfix_test.yaml.snap b/charts/mok/tests/__snapshot__/postfix_test.yaml.snap
index e3ecbec7d..51a2f7584 100644
--- a/charts/mok/tests/__snapshot__/postfix_test.yaml.snap
+++ b/charts/mok/tests/__snapshot__/postfix_test.yaml.snap
@@ -494,7 +494,7 @@ should match snapshot:
                   command:
                     - sh
                     - -c
-                    - ps axf | fgrep -v grep | fgrep -q "supervisord" && ps axf | fgrep -v grep | fgrep -q "/usr/libexec/postfix/master"
+                    - ps axf | fgrep -v grep | fgrep -q "/usr/libexec/postfix/master"
                 failureThreshold: 12
                 initialDelaySeconds: 2
                 periodSeconds: 5
-- 
GitLab