fix: add compatibility with latest Mailu master branch (#44)

Mailu · Dec 8, 2022 · 25eb5e5 · 25eb5e5
2 parents 345f84c + 86d3cd7
commit 25eb5e5
Show file tree

Hide file tree

Showing 13 changed files with 245 additions and 230 deletions.
diff --git a/ct.yaml b/ct.yaml
@@ -1,4 +1,4 @@
-helm-extra-args: --timeout 720s
+helm-extra-args: --timeout 360s
 chart-dirs:
   - .
 chart-repos:

diff --git a/mailu/MIGRATION_GUIDE.md b/mailu/MIGRATION_GUIDE.md
@@ -61,3 +61,4 @@ You will also need to manually delete the existing `Ingress`, as well as all exi
 | `certmanager.*`                         | `-`                                         | Removed. Configure using annotations on `ingress.annotations` to generate a valid certificate instead.              |
 | `ingress.tlsFlavor`                     | `ingress.tlsFlavorOverride`                 |                                                                                                                     |
 | `ingress.externalIngress`               | `ingress.enabled`                           |                                                                                                                     |
+| `roundcube.*`                           | `webmail.*`                                 | `roundcube` has been renamed to `webmail`                                                                           |
diff --git a/mailu/README.md b/mailu/README.md
diff --git a/mailu/ci/helm-lint-values.yaml b/mailu/ci/helm-lint-values.yaml
@@ -6,11 +6,13 @@ domain: example.com
 initialAccount:
   enabled: true
   username: mailadmin
-  domain: mydomain.com
+  domain: example.com
   password: chang3m3!
 
 secretKey: chang3m3!
 
+subnet: 10.0.0.0/8
+
 persistence:
   single_pvc: false
 
@@ -38,9 +40,9 @@ ingress:
     auth.cluster.arpa/enabled: "false"
 
 front:
-  logLevel: WARNING
-#  image:
-#    tag: master
+  logLevel: INFO
+  image:
+    tag: master
   resources:
     requests:
       memory: 100Mi
@@ -50,9 +52,9 @@ front:
       cpu: 200m
 
 admin:
-  logLevel: WARNING
-#  image:
-#    tag: master
+  logLevel: DEBUG
+  image:
+    tag: master
   resources:
     requests:
       memory: 500Mi
@@ -62,9 +64,9 @@ admin:
       cpu: 1
 
 postfix:
-  logLevel: WARNING
-#  image:
-#    tag: master
+  logLevel: INFO
+  image:
+    tag: master
   resources:
     requests:
       memory: 2Gi
@@ -74,9 +76,9 @@ postfix:
       cpu: 1
 
 dovecot:
-  logLevel: WARNING
-#  image:
-#    tag: master
+  logLevel: INFO
+  image:
+    tag: master
   resources:
     requests:
       memory: 500Mi
@@ -87,8 +89,8 @@ dovecot:
 
 rspamd:
   logLevel: INFO
-#  image:
-#    tag: master
+  image:
+    tag: master
   resources:
     requests:
       memory: 100Mi
@@ -98,9 +100,9 @@ rspamd:
       cpu: 1
 
 clamav:
-  logLevel: WARNING
-#  image:
-#    tag: master
+  logLevel: INFO
+  image:
+    tag: master
   resources:
     requests:
       memory: 1Gi
@@ -109,10 +111,10 @@ clamav:
       memory: 2Gi
       cpu: 1
 
-roundcube:
-  logLevel: WARNING
-#  image:
-#    tag: master
+webmail:
+  logLevel: INFO
+  image:
+    tag: master
   resources:
     requests:
       memory: 100Mi
@@ -122,14 +124,14 @@ roundcube:
       cpu: 1
 
 webdav:
-  logLevel: WARNING
-#  image:
-#    tag: master
+  logLevel: INFO
+  image:
+    tag: master
 
 fetchmail:
-  logLevel: WARNING
-#  image:
-#    tag: master
+  logLevel: INFO
+  image:
+    tag: master
 
 redis:
   master:

diff --git a/mailu/templates/_claims.tpl b/mailu/templates/_claims.tpl
@@ -19,8 +19,8 @@
 {{- end -}}
 
 {{/* Roundcube pod persistent volume claim name */}}
-{{ define "mailu.roundcube.claimName" }}
-{{- .Values.persistence.single_pvc | ternary (include "mailu.claimName" .) .Values.roundcube.persistence.claimNameOverride | default (printf "%s-roundcube" (include "mailu.fullname" .)) -}}
+{{ define "mailu.webmail.claimName" }}
+{{- .Values.persistence.single_pvc | ternary (include "mailu.claimName" .) .Values.webmail.persistence.claimNameOverride | default (printf "%s-webmail" (include "mailu.fullname" .)) -}}
 {{- end -}}
 
 {{/* Fetchmail pod persistent volume claim name */}}

diff --git a/mailu/templates/_services.tpl b/mailu/templates/_services.tpl
@@ -7,7 +7,7 @@ Mailu services:
 - front
 - postfix
 - redis
-- roundcube
+- webmail
 - rspamd
 - webdav
 
@@ -119,13 +119,13 @@ Service fqdn (within cluster) can be retrieved with `mailu.SERVICE.serviceFqdn`
 {{- end -}}
 
 
-{{/* Returns roundcube internal service name. */}}
-{{- define "mailu.roundcube.serviceName" -}}
-{{- printf "%s-roundcube" (include "mailu.fullname" .) -}}
+{{/* Returns webmail internal service name. */}}
+{{- define "mailu.webmail.serviceName" -}}
+{{- printf "%s-webmail" (include "mailu.fullname" .) -}}
 {{- end -}}
-{{/* Returns roundcube internal service fqdn. */}}
-{{- define "mailu.roundcube.serviceFqdn" -}}
-{{- printf "%s.%s.svc.%s" (include "mailu.roundcube.serviceName" . ) (include "common.names.namespace" . ) (include "mailu.clusterDomain" . ) -}}
+{{/* Returns webmail internal service fqdn. */}}
+{{- define "mailu.webmail.serviceFqdn" -}}
+{{- printf "%s.%s.svc.%s" (include "mailu.webmail.serviceName" . ) (include "common.names.namespace" . ) (include "mailu.clusterDomain" . ) -}}
 {{- end -}}
 
 {{/* Returns rspamd internal service name. */}}

diff --git a/mailu/templates/admin/deployment.yaml b/mailu/templates/admin/deployment.yaml
@@ -97,13 +97,13 @@ spec:
               value: {{ include "mailu.postfix.serviceFqdn" . }}
             - name: REDIS_ADDRESS
               value: {{ include "mailu.redis.serviceFqdn" . }}
-            {{- if .Values.roundcube.enabled }}
+            {{- if .Values.webmail.enabled }}
             - name: WEBMAIL
-              value: roundcube
+              value: {{ .Values.webmail.type | quote }}
             - name: WEB_WEBMAIL
-              value: {{ required "roundcube.uri" .Values.roundcube.uri }}
+              value: {{ required "webmail.uri" .Values.webmail.uri }}
             - name: WEBMAIL_ADDRESS
-              value: {{ include "mailu.roundcube.serviceFqdn" . }}
+              value: {{ include "mailu.webmail.serviceFqdn" . }}
             {{- else }}
             - name: WEBMAIL
               value: none
@@ -218,6 +218,10 @@ spec:
               path: /sso/login
               port: http
           {{- end }}
+          securityContext:
+            capabilities:
+              add:
+                - NET_BIND_SERVICE
       volumes:
         - name: data
           persistentVolumeClaim:

diff --git a/mailu/templates/front/deployment.yaml b/mailu/templates/front/deployment.yaml
@@ -98,15 +98,15 @@ spec:
             - name: REAL_IP_FROM
               value: {{ default "0.0.0.0/0" .Values.ingress.realIpFrom }}
             {{- end }}
-            {{- if .Values.roundcube.enabled }}
+            {{- if .Values.webmail.enabled }}
             - name: WEBMAIL
-              value: roundcube
+              value: {{ .Values.webmail.type | quote }}
             - name: WEBMAIL_ADDRESS
-              value: {{ include "mailu.roundcube.serviceFqdn" . }}
+              value: {{ include "mailu.webmail.serviceFqdn" . }}
             - name: WEB_WEBMAIL
-              value: {{ required "roundcube.uri" .Values.roundcube.uri }}
+              value: {{ required "webmail.uri" .Values.webmail.uri }}
             - name: WEBROOT_REDIRECT
-              value: {{ required "roundcube.uri" .Values.roundcube.uri }}
+              value: {{ required "webmail.uri" .Values.webmail.uri }}
             {{- else }}
             - name: WEBMAIL
               value: none