From 35c5e44bc3fe960d4763c57c8ca53c10ded38685 Mon Sep 17 00:00:00 2001
From: Sven-Erik Schmidt <sschmidt@b1-systems.de>
Date: Tue, 7 Oct 2025 14:01:49 +0200
Subject: [PATCH] fix(external-services): Add otterize annotations for clamav
 distributed

---
 .../open-xchange/values-openxchange.yaml.gotmpl   |  6 ++++--
 .../values-clamav-distributed.yaml.gotmpl         | 15 ++++++++++++---
 .../services-external/values-dkimpy.yaml.gotmpl   |  2 +-
 .../environments/default/annotations.yaml.gotmpl  |  5 +++++
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
index aa548dad..7ebbc3c0 100644
--- a/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
@@ -69,7 +69,10 @@ public-sector-ui:
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   replicaCount: {{ .Values.replicas.openxchangePublicSectorUI }}
   podAnnotations:
-    {{ .Values.annotations.openxchangePublicSectorUi.pod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: open-xchange-public-sector-ui
+    {{- with .Values.annotations.openxchangePublicSectorUi.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   resources:
     {{ .Values.resources.openxchangePublicSectorUI | toYaml | nindent 4 }}
   securityContext:
@@ -356,7 +359,6 @@ appsuite:
         runAsNonRoot: true
         runAsUser: 1001
         runAsGroup: 1001
-        privileged: false
         seccompProfile:
           type: "RuntimeDefault"
         seLinuxOptions:
diff --git a/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl b/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl
index 2e66a78e..d084c0a2 100644
--- a/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl
@@ -84,7 +84,10 @@ freshclam:
     tag: {{ .Values.images.freshclam.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   podAnnotations:
-    {{ .Values.annotations.servicesExternalClamavDistributed.freshclamPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "clamav-freshclam"
+    {{- with .Values.annotations.servicesExternalClamavDistributed.freshclamPod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -132,7 +135,10 @@ icap:
     tag: {{ .Values.images.icap.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   podAnnotations:
-    {{ .Values.annotations.servicesExternalClamavDistributed.icapPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "clamav-icap"
+    {{- with .Values.annotations.servicesExternalClamavDistributed.icapPod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -172,7 +178,10 @@ milter:
     tag: {{ .Values.images.milter.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   podAnnotations:
-    {{ .Values.annotations.servicesExternalClamavDistributed.milterPod | toYaml | nindent 4 }}
+    intents.otterize.com/service-name: "clamav-milter"
+    {{- with .Values.annotations.servicesExternalClamavDistributed.milterPod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
diff --git a/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl b/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl
index a67dcb8e..c1f23e8a 100644
--- a/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl
+++ b/helmfile/apps/services-external/values-dkimpy.yaml.gotmpl
@@ -30,7 +30,7 @@ image:
   imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
 podAnnotations:
-  intents.otterize.com/service-name: "dkimpy"
+  intents.otterize.com/service-name: "dkimpy-milter"
   {{- with .Values.annotations.servicesExternalDkimpy.service }}
   {{ .  | toYaml | nindent 2 }}
   {{- end }}
diff --git a/helmfile/environments/default/annotations.yaml.gotmpl b/helmfile/environments/default/annotations.yaml.gotmpl
index 32ad72e8..3712b4d0 100644
--- a/helmfile/environments/default/annotations.yaml.gotmpl
+++ b/helmfile/environments/default/annotations.yaml.gotmpl
@@ -376,7 +376,12 @@ annotations:
     clamdPod: ~
     clamdService: ~
     clamdServiceAccount: ~
+    icapCommon: ~
+    icapPod: ~
+    icapService: ~
+    icapServiceAccount: ~
     freshclamCommon: ~
+    freshclamPod: ~
     freshclamService: ~
     freshclamServiceAccount: ~
     milterCommon: ~