From c381f082cd2317e006998fd26daec1dc618dc747 Mon Sep 17 00:00:00 2001 From: "Nelo-T. Wallus" Date: Sat, 26 Jul 2025 15:24:17 +0200 Subject: [PATCH 1/2] Fix (container) securityContext for admin --- charts/mailu/templates/admin/deployment.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/charts/mailu/templates/admin/deployment.yaml b/charts/mailu/templates/admin/deployment.yaml index 9c44c6bf..5d3b520d 100644 --- a/charts/mailu/templates/admin/deployment.yaml +++ b/charts/mailu/templates/admin/deployment.yaml @@ -67,9 +67,6 @@ spec: - name: admin image: {{ .Values.imageRegistry }}/{{ .Values.admin.image.repository }}:{{ default (include "mailu.version" .) .Values.admin.image.tag }} imagePullPolicy: {{ .Values.admin.image.pullPolicy }} - {{- if .Values.admin.containerSecurityContext.enabled }} - securityContext: {{- omit .Values.admin.containerSecurityContext "enabled" | toYaml | nindent 12 }} - {{- end }} volumeMounts: - name: data subPath: admin @@ -126,9 +123,11 @@ spec: port: http {{- end }} securityContext: - capabilities: - add: - - NET_BIND_SERVICE + {{- $securityContext := dict "capabilities" (dict "add" (list "NET_BIND_SERVICE")) }} + {{- if .Values.admin.containerSecurityContext }} + {{- $securityContext = merge $securityContext (omit .Values.admin.containerSecurityContext "enabled") }} + {{- end }} + {{- toYaml $securityContext | nindent 12 }} {{- if .Values.admin.extraContainers }} {{- toYaml .Values.admin.extraContainers | nindent 8 }} {{- end }} From f5f1d8e298234ad34a6c1c1fc1227b6c26c1bce9 Mon Sep 17 00:00:00 2001 From: Lorenzo Bernardi Date: Fri, 22 Aug 2025 00:19:56 +0200 Subject: [PATCH 2/2] Update charts/mailu/templates/admin/deployment.yaml Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- charts/mailu/templates/admin/deployment.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/mailu/templates/admin/deployment.yaml b/charts/mailu/templates/admin/deployment.yaml index 5d3b520d..74a72a42 100644 --- a/charts/mailu/templates/admin/deployment.yaml +++ b/charts/mailu/templates/admin/deployment.yaml @@ -124,7 +124,7 @@ spec: {{- end }} securityContext: {{- $securityContext := dict "capabilities" (dict "add" (list "NET_BIND_SERVICE")) }} - {{- if .Values.admin.containerSecurityContext }} + {{- if and .Values.admin.containerSecurityContext (hasKey .Values.admin.containerSecurityContext "enabled") .Values.admin.containerSecurityContext.enabled }} {{- $securityContext = merge $securityContext (omit .Values.admin.containerSecurityContext "enabled") }} {{- end }} {{- toYaml $securityContext | nindent 12 }}