From ca2716220947bc0c44ce549bf62643fed238ebd5 Mon Sep 17 00:00:00 2001
From: Sheogorath <sheogorath@shivering-isles.com>
Date: Tue, 10 Jan 2023 14:01:17 +0000
Subject: [PATCH] fix(mail): Drop shared service for dovecot and postfix
With different traffic policies and alike, the shared loadbalancer
causes more problems than it resolves. The original reason was that both
remote addresses would point to the same address, but this is a
non-issue given it all runs through a remote anyway.
---
charts/mok/Chart.yaml | 2 +-
charts/mok/templates/dovecot.yaml | 2 --
charts/mok/templates/postfix.yaml | 2 --
charts/mok/tests/__snapshot__/dovecot_test.yaml.snap | 2 --
charts/mok/tests/__snapshot__/postfix_test.yaml.snap | 2 --
5 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/charts/mok/Chart.yaml b/charts/mok/Chart.yaml
index e8e5cbdd8..49c61b587 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.8.0
+version: 0.9.0
sources:
- https://de.postfix.org/ftpmirror/index.html
- https://github.com/dovecot/core
diff --git a/charts/mok/templates/dovecot.yaml b/charts/mok/templates/dovecot.yaml
index 32e470a49..9950dda22 100644
--- a/charts/mok/templates/dovecot.yaml
+++ b/charts/mok/templates/dovecot.yaml
@@ -1,8 +1,6 @@
apiVersion: v1
kind: Service
metadata:
- annotations:
- metallb.universe.tf/allow-shared-ip: "{{ include "mok.fullname" . }}-mail"
name: {{ include "mok.fullname" . }}-dovecot
labels:
{{- include "mok.labels" . | nindent 4 }}
diff --git a/charts/mok/templates/postfix.yaml b/charts/mok/templates/postfix.yaml
index 139fbaa41..7fc95dae7 100644
--- a/charts/mok/templates/postfix.yaml
+++ b/charts/mok/templates/postfix.yaml
@@ -5,8 +5,6 @@ metadata:
labels:
{{- include "mok.labels" . | nindent 4 }}
app.kubernetes.io/component: postfix
- annotations:
- metallb.universe.tf/allow-shared-ip: "{{ include "mok.fullname" . }}-mail"
spec:
ports:
- port: 25
diff --git a/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap b/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap
index 646a99967..41a8bdf3f 100644
--- a/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap
+++ b/charts/mok/tests/__snapshot__/dovecot_test.yaml.snap
@@ -3,8 +3,6 @@ should match snapshot:
apiVersion: v1
kind: Service
metadata:
- annotations:
- metallb.universe.tf/allow-shared-ip: RELEASE-NAME-mok-mail
labels:
app.kubernetes.io/component: dovecot
app.kubernetes.io/instance: RELEASE-NAME
diff --git a/charts/mok/tests/__snapshot__/postfix_test.yaml.snap b/charts/mok/tests/__snapshot__/postfix_test.yaml.snap
index 57b8d63ad..eac63ad5e 100644
--- a/charts/mok/tests/__snapshot__/postfix_test.yaml.snap
+++ b/charts/mok/tests/__snapshot__/postfix_test.yaml.snap
@@ -3,8 +3,6 @@ should match snapshot:
apiVersion: v1
kind: Service
metadata:
- annotations:
- metallb.universe.tf/allow-shared-ip: RELEASE-NAME-mok-mail
labels:
app.kubernetes.io/component: postfix
app.kubernetes.io/instance: RELEASE-NAME
--
GitLab