From 669ea84dbc2b1724a84dccf4de86d33b70cde790 Mon Sep 17 00:00:00 2001 From: Travis Neely Date: Wed, 31 Dec 2025 11:19:18 +0000 Subject: [PATCH 1/3] feat(webmail,rspamd): update dnsPolicy and dnsConfig --- charts/mailu/templates/rspamd/deployment.yaml | 6 ++++++ charts/mailu/templates/webmail/deployment.yaml | 6 ++++++ charts/mailu/values.yaml | 16 ++++++++++++++++ 3 files changed, 28 insertions(+) diff --git a/charts/mailu/templates/rspamd/deployment.yaml b/charts/mailu/templates/rspamd/deployment.yaml index d6810c51..ab308b6e 100644 --- a/charts/mailu/templates/rspamd/deployment.yaml +++ b/charts/mailu/templates/rspamd/deployment.yaml @@ -58,6 +58,12 @@ spec: {{- if .Values.rspamd.terminationGracePeriodSeconds }} terminationGracePeriodSeconds: {{ .Values.rspamd.terminationGracePeriodSeconds }} {{- end }} + {{- if .Values.rspamd.dnsPolicy }} + dnsPolicy: {{ .Values.rspamd.dnsPolicy | quote }} + {{- end }} + {{- if .Values.rspamd.dnsConfig }} + dnsConfig: {{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.dnsConfig "context" $) | nindent 8 }} + {{- end }} {{- if .Values.rspamd.initContainers }} initContainers: {{- include "mailu.tplvalues.render" (dict "value" .Values.rspamd.initContainers "context" $) | nindent 8 }} {{- end }} diff --git a/charts/mailu/templates/webmail/deployment.yaml b/charts/mailu/templates/webmail/deployment.yaml index e7c51b4e..8ec8bcec 100644 --- a/charts/mailu/templates/webmail/deployment.yaml +++ b/charts/mailu/templates/webmail/deployment.yaml @@ -58,6 +58,12 @@ spec: {{- if .Values.webmail.terminationGracePeriodSeconds }} terminationGracePeriodSeconds: {{ .Values.webmail.terminationGracePeriodSeconds }} {{- end }} + {{- if .Values.webmail.dnsPolicy }} + dnsPolicy: {{ .Values.webmail.dnsPolicy | quote }} + {{- end }} + {{- if .Values.webmail.dnsConfig }} + dnsConfig: {{- include "mailu.tplvalues.render" (dict "value" .Values.webmail.dnsConfig "context" $) | nindent 8 }} + {{- end }} {{- if .Values.webmail.initContainers }} initContainers: {{- include "mailu.tplvalues.render" (dict "value" .Values.webmail.initContainers "context" $) | nindent 8 }} {{- end }} diff --git a/charts/mailu/values.yaml b/charts/mailu/values.yaml index 7aaef190..d4665f27 100644 --- a/charts/mailu/values.yaml +++ b/charts/mailu/values.yaml @@ -1920,6 +1920,14 @@ rspamd: ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods terminationGracePeriodSeconds: 2 + ## @param rspamd.dnsPolicy DNS Policy of the rspamd pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy + dnsPolicy: "" + + ## @param rspamd.dnsConfig DNS settings for the rspamd pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config + dnsConfig: {} + ## @param rspamd.affinity Affinity for rspamd pod assignment ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity affinity: {} @@ -2401,6 +2409,14 @@ webmail: ## ref: https://kubernetes.io/docs/concepts/workloads/pods/pod/#termination-of-pods terminationGracePeriodSeconds: 2 + ## @param webmail.dnsPolicy DNS Policy of the webmail pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy + dnsPolicy: "" + + ## @param webmail.dnsConfig DNS settings for the webmail pod + ## ref: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-dns-config + dnsConfig: {} + ## @param webmail.affinity Affinity for webmail pod assignment ## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#affinity-and-anti-affinity affinity: {} From e76accf0b3ac201459bccde8173485cc0bbc7cd5 Mon Sep 17 00:00:00 2001 From: Travis Neely Date: Wed, 31 Dec 2025 11:32:57 +0000 Subject: [PATCH 2/3] docs(readme): update documentation --- charts/mailu/README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/charts/mailu/README.md b/charts/mailu/README.md index 046f3686..b0eadaf2 100644 --- a/charts/mailu/README.md +++ b/charts/mailu/README.md @@ -664,6 +664,8 @@ helm uninstall mailu --namespace=mailu-mailserver | `rspamd.containerSecurityContext.runAsUser` | Set containers' Security Context runAsUser | `1001` | | `rspamd.containerSecurityContext.runAsNonRoot` | Set container's Security Context runAsNonRoot | `false` | | `rspamd.terminationGracePeriodSeconds` | In seconds, time given to the pod to terminate gracefully | `2` | +| `rspamd.dnsPolicy` | DNS Policy of the rspamd pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) | `""` | +| `rspamd.dnsConfig` | DNS settings for the rspamd pod | `{}` | | `rspamd.affinity` | Affinity for rspamd pod assignment | `{}` | | `rspamd.tolerations` | Tolerations for pod assignment | `[]` | | `rspamd.revisionHistoryLimit` | Configure the revisionHistoryLimit of the deployment | `3` | @@ -797,6 +799,8 @@ helm uninstall mailu --namespace=mailu-mailserver | `webmail.containerSecurityContext.runAsUser` | Set containers' Security Context runAsUser | `1001` | | `webmail.containerSecurityContext.runAsNonRoot` | Set container's Security Context runAsNonRoot | `false` | | `webmail.terminationGracePeriodSeconds` | In seconds, time given to the pod to terminate gracefully | `2` | +| `webmail.dnsPolicy` | DNS Policy of the webmail pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) | `""` | +| `webmail.dnsConfig` | DNS settings for the webmail pod | `{}` | | `webmail.affinity` | Affinity for webmail pod assignment | `{}` | | `webmail.tolerations` | Tolerations for pod assignment | `[]` | | `webmail.revisionHistoryLimit` | Configure the revisionHistoryLimit of the deployment | `3` | From 4611454b4cb919abb2223651014eb9025a88ffef Mon Sep 17 00:00:00 2001 From: Travis Neely Date: Wed, 31 Dec 2025 11:43:00 +0000 Subject: [PATCH 3/3] docs(readme): update documentation to fix formatting --- charts/mailu/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/mailu/README.md b/charts/mailu/README.md index b0eadaf2..5e99a07c 100644 --- a/charts/mailu/README.md +++ b/charts/mailu/README.md @@ -664,7 +664,7 @@ helm uninstall mailu --namespace=mailu-mailserver | `rspamd.containerSecurityContext.runAsUser` | Set containers' Security Context runAsUser | `1001` | | `rspamd.containerSecurityContext.runAsNonRoot` | Set container's Security Context runAsNonRoot | `false` | | `rspamd.terminationGracePeriodSeconds` | In seconds, time given to the pod to terminate gracefully | `2` | -| `rspamd.dnsPolicy` | DNS Policy of the rspamd pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) | `""` | +| `rspamd.dnsPolicy` | DNS Policy of the rspamd pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) | | `rspamd.dnsConfig` | DNS settings for the rspamd pod | `{}` | | `rspamd.affinity` | Affinity for rspamd pod assignment | `{}` | | `rspamd.tolerations` | Tolerations for pod assignment | `[]` | @@ -799,7 +799,7 @@ helm uninstall mailu --namespace=mailu-mailserver | `webmail.containerSecurityContext.runAsUser` | Set containers' Security Context runAsUser | `1001` | | `webmail.containerSecurityContext.runAsNonRoot` | Set container's Security Context runAsNonRoot | `false` | | `webmail.terminationGracePeriodSeconds` | In seconds, time given to the pod to terminate gracefully | `2` | -| `webmail.dnsPolicy` | DNS Policy of the webmail pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) | `""` | +| `webmail.dnsPolicy` | DNS Policy of the webmail pod (`Default`, `ClusterFirst`, `ClusterFirstWithHostNet` and `None`) | | `webmail.dnsConfig` | DNS settings for the webmail pod | `{}` | | `webmail.affinity` | Affinity for webmail pod assignment | `{}` | | `webmail.tolerations` | Tolerations for pod assignment | `[]` |