From 350042a71b5932a70af03b2161a2b61bf5e428a3 Mon Sep 17 00:00:00 2001 From: Fabio Rauber Date: Wed, 3 Aug 2022 14:50:17 -0300 Subject: [PATCH] Fix issue with rspamd milter port --- charts/rspamd/v0.1.0/templates/locald-configmap.yaml | 2 +- charts/rspamd/v0.1.0/templates/service.yaml | 6 ++++++ charts/rspamd/v0.1.0/values.yaml | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/charts/rspamd/v0.1.0/templates/locald-configmap.yaml b/charts/rspamd/v0.1.0/templates/locald-configmap.yaml index c2eae68..d9610a7 100644 --- a/charts/rspamd/v0.1.0/templates/locald-configmap.yaml +++ b/charts/rspamd/v0.1.0/templates/locald-configmap.yaml @@ -33,7 +33,7 @@ data: password = "{{ .Values.redis.auth.password }}"; worker-proxy.inc: |- milter = {{ .Values.rspamd.workerProxy.milter }}; - bind_socket = "*:11332" + bind_socket = "*:{{ .Values.service.ports.milter }}"; timeout = {{ .Values.rspamd.workerProxy.timeout }}; upstream "local" { default = yes; # Self-scan upstreams are always default diff --git a/charts/rspamd/v0.1.0/templates/service.yaml b/charts/rspamd/v0.1.0/templates/service.yaml index fc224eb..9c5148e 100644 --- a/charts/rspamd/v0.1.0/templates/service.yaml +++ b/charts/rspamd/v0.1.0/templates/service.yaml @@ -7,6 +7,12 @@ metadata: spec: type: {{ .Values.service.type }} ports: + {{ if eq .Values.rspamd.workerProxy.milter "yes" -}} + - port: {{ .Values.service.ports.milter }} + targetPort: {{ .Values.service.ports.milter }} + protocol: TCP + name: milter + {{- end }} - port: {{ .Values.service.ports.antispam }} targetPort: {{ .Values.service.ports.antispam }} protocol: TCP diff --git a/charts/rspamd/v0.1.0/values.yaml b/charts/rspamd/v0.1.0/values.yaml index 335a9aa..cca8c5b 100644 --- a/charts/rspamd/v0.1.0/values.yaml +++ b/charts/rspamd/v0.1.0/values.yaml @@ -59,6 +59,7 @@ service: ports: antispam: 11333 http: 11334 + milter: 11332 ingress: enabled: false