From c9a763f368f6b23a7760f90b2b4ab79245bf27ea Mon Sep 17 00:00:00 2001
From: Thomas Kaltenbrunner <thomas.kaltenbrunner.extern@univention.de>
Date: Fri, 4 Aug 2023 00:17:20 +0200
Subject: [PATCH] feat(open-xchange): Add service type for dovecot

---
 helmfile/apps/open-xchange/helmfile.yaml         |  2 +-
 helmfile/apps/open-xchange/values-dovecot.gotmpl | 13 +++++++++----
 helmfile/apps/open-xchange/values-dovecot.yaml   |  8 ++++----
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/helmfile/apps/open-xchange/helmfile.yaml b/helmfile/apps/open-xchange/helmfile.yaml
index e71120f2..41de4334 100644
--- a/helmfile/apps/open-xchange/helmfile.yaml
+++ b/helmfile/apps/open-xchange/helmfile.yaml
@@ -16,7 +16,7 @@ repositories:
 releases:
   - name: "dovecot"
     chart: "dovecot/dovecot"
-    version: "1.1.0"
+    version: "1.2.0"
     values:
       - "values-dovecot.yaml"
       - "values-dovecot.gotmpl"
diff --git a/helmfile/apps/open-xchange/values-dovecot.gotmpl b/helmfile/apps/open-xchange/values-dovecot.gotmpl
index a05e899d..00833401 100644
--- a/helmfile/apps/open-xchange/values-dovecot.gotmpl
+++ b/helmfile/apps/open-xchange/values-dovecot.gotmpl
@@ -25,9 +25,8 @@ dovecot:
     clientID: "as8oidc"
   loginTrustedNetworks: "{{ .Values.cluster.networking.cidr }}"
 
-ingress:
-  tls:
-    secretName: "{{ .Values.ingress.tls.secretName }}"
+certificate:
+  secretName: "{{ .Values.ingress.tls.secretName }}"
 
 {{- if .Values.cluster.persistence.readWriteMany.enabled }}
 replicaCount: {{ .Values.replicas.dovecot }}
@@ -35,7 +34,6 @@ replicaCount: {{ .Values.replicas.dovecot }}
 replicaCount: 1
 {{- end }}
 
-
 persistence:
   {{- if .Values.cluster.persistence.readWriteMany.enabled }}
   storageClassName: "{{ .Values.persistence.storageClassNames.RWX }}"
@@ -50,4 +48,11 @@ persistence:
 
 resources:
   {{ .Values.resources.dovecot | toYaml | nindent 2 }}
+
+{{- if or (eq .Values.cluster.service.type "NodePort") (eq .Values.cluster.service.type "LoadBalancer") }}
+service:
+  external:
+    enabled: true
+    type: {{ .Values.cluster.service.type | quote }}
+{{- end }}
 ...
diff --git a/helmfile/apps/open-xchange/values-dovecot.yaml b/helmfile/apps/open-xchange/values-dovecot.yaml
index 6e5abc00..b14a7ed4 100644
--- a/helmfile/apps/open-xchange/values-dovecot.yaml
+++ b/helmfile/apps/open-xchange/values-dovecot.yaml
@@ -1,9 +1,12 @@
 # SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
 # SPDX-License-Identifier: Apache-2.0
 ---
+containerSecurityContext:
+  readOnlyRootFilesystem: false
+
 dovecot:
   ldap:
-    enbaled: true
+    enabled: true
     host: "univention-corporate-container"
     port: 389
     base: "dc=swp-ldap,dc=internal"
@@ -12,7 +15,4 @@ dovecot:
     enabled: true
     clientID: "as8oidc"
     usernameAttribute: "phoenixusername"
-
-ingress:
-  enabled: false
 ...