SLT-1193: Clean up mailhog configuration from chart templates.

Author: Kalvis Kazoks

charts/drupal/templates/NOTES.txt

@@ -16,16 +16,6 @@ Your site is available at:
   {{- end }}
   {{- end }}
 
-{{- if .Values.mailhog.enabled }}
-  
-Mailhog available at:
-
-  http://{{- template "drupal.domain" . }}/mailhog
-  {{- range $index, $domain := .Values.exposeDomains }}
-  http://{{ $domain.hostname }}/mailhog
-  {{- end }}
-{{- end }}
-
 {{- if .Values.mailpit.enabled }}
 
 Mailpit available at:

charts/drupal/templates/_helpers.tpl

@@ -98,8 +98,6 @@ imagePullSecrets:
 - name: SMTP_ADDRESS
   {{- if .Values.mailpit.enabled }}
   value: "{{ .Release.Name }}-mailpit-smtp:25"
-  {{ else if .Values.mailhog.enabled }}
-  value: "{{ .Release.Name }}-mailhog:1025"
   {{ else }}
   value: {{ .Values.smtp.address | quote }}
   {{- end }}
@@ -118,8 +116,6 @@ imagePullSecrets:
 - name: SSMTP_MAILHUB
   {{- if .Values.mailpit.enabled }}
   value: "{{ .Release.Name }}-mailpit-smtp:25"
-  {{ else if .Values.mailhog.enabled }}
-  value: "{{ .Release.Name }}-mailhog:1025"
   {{ else }}
   value: {{ .Values.smtp.address | quote }}
   {{- end }}
@@ -244,12 +240,7 @@ imagePullSecrets:
 - name: ELASTICSEARCH_HOST
   value: {{ .Release.Name }}-es
 {{- end }}
-{{- if or .Values.mailhog.enabled .Values.mailpit.enabled .Values.smtp.enabled }}
-{{- if .Values.mailhog.enabled }}
-{{- if contains "mailhog" .Release.Name -}}
-{{- fail "Do not use 'mailhog' in release name or deployment will fail" -}}
-{{- end }}
-{{- end }}
+{{- if or .Values.mailpit.enabled .Values.smtp.enabled }}
 {{- if .Values.mailpit.enabled }}
 {{- if contains "mailpit" .Release.Name -}}
 {{- fail "Do not use 'mailpit' in release name or deployment will fail" -}}

charts/drupal/templates/checks.yaml

@@ -1,11 +1,5 @@
-{{- if and .Values.mailhog.enabled .Values.mailpit.enabled }}
-{{- fail "Mailhog and mailpit can't be enabled at the same time as those are overlapping services. Use mailpit only as mailhog is deprecated." -}}
-{{- end }}
 {{- if index (index .Values "silta-release") "branchName" }}
 {{- if eq (index (index .Values "silta-release") "branchName") "production" }}
-{{- if .Values.mailhog.enabled }}
-{{- fail "Mailhog should not be enabled in production" -}}
-{{- end }}
 {{- if .Values.mailpit.enabled }}
 {{- fail "Mailpit should not be enabled in production" -}}
 {{- end }}

charts/drupal/templates/drupal-configmap.yaml

@@ -395,40 +395,6 @@ data:
       }
       {{- end }}
 
-      {{- if .Values.mailhog.enabled }}
-      location /mailhog {
-
-        # Auth / whitelist always enabled
-        satisfy any;
-        allow 127.0.0.1;
-        {{- range .Values.nginx.noauthips }}
-        allow {{ . }};
-        {{- end }}
-        deny all;
-
-        {{- if gt (len .Values.nginx.noauthips) 1 -}}
-        # Basic auth only offered when at least one extra ip is whitelisted. Prevents using default credentials.
-        auth_basic "Restricted";
-        auth_basic_user_file /etc/nginx/.htaccess;
-        {{- end}}
-
-        rewrite ^/mailhog$ /mailhog/ permanent;
-
-        # Proxy to mailhog container
-        rewrite /mailhog(.*) $1 break;
-        proxy_pass http://{{ .Release.Name }}-mailhog:8025/;
-
-        # Websock connection
-        chunked_transfer_encoding on;
-        proxy_set_header X-NginX-Proxy true;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_http_version 1.1;
-        proxy_redirect off;
-        proxy_buffering off;
-      }
-      {{- end}}
-
       {{- if .Values.mailpit.enabled }}
       # Redirect the legacy mailhog service to mailpit.
       location /mailhog {

charts/drupal/templates/smtp-secret.yaml

@@ -1,4 +1,4 @@
-{{- if or .Values.mailpit.enabled .Values.mailhog.enabled .Values.smtp.enabled }}
+{{- if or .Values.mailpit.enabled .Values.smtp.enabled }}
 apiVersion: v1
 kind: Secret
 metadata:

charts/drupal/templates/varnish-configmap-vcl.yaml

@@ -397,13 +397,6 @@ data:
       }
       {{- end }}
 
-      {{- if .Values.mailhog.enabled }}
-      // No varnish for mailhog
-      if (req.url ~ "^/mailhog$") {
-        return (pass);
-      }
-      {{- end }}
-
       {{- if .Values.mailpit.enabled }}
       // No varnish for mailpit
       if (req.url ~ "^/mailpit(/|$)") {