From 82dcf7d5820660f7a243cb7bfba4d71e9998a29a Mon Sep 17 00:00:00 2001
From: Sven-Erik Schmidt <sschmidt@b1-systems.de>
Date: Tue, 30 Sep 2025 08:34:25 +0200
Subject: [PATCH] fix(nextcloud): Add otterize annotations

---
 .../nextcloud/values-nextcloud-management.yaml.gotmpl     | 2 +-
 .../nextcloud/values-nextcloud-notifypush.yaml.gotmpl     | 6 ++++--
 helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl      | 8 ++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
index 9f9c02c3..3dddab1b 100644
--- a/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud-management.yaml.gotmpl
@@ -10,7 +10,7 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 additionalAnnotations:
-  intents.otterize.com/service-name: "opendesk-nextcloud-php"
+  intents.otterize.com/service-name: "opendesk-nextcloud-management"
   {{- with .Values.annotations.nextcloudNextcloudMgmt.additional }}
   {{ . | toYaml | nindent 2}}
   {{- end }}
diff --git a/helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl
index dc51230c..562c6e31 100644
--- a/helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud-notifypush.yaml.gotmpl
@@ -10,7 +10,6 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 additionalAnnotations:
-  intents.otterize.com/service-name: "opendesk-nextcloud-notifypush"
   {{- with .Values.annotations.nextcloudNotifyPush.additional }}
   {{ . | toYaml | nindent 4 }}
   {{- end }}
@@ -114,7 +113,10 @@ metrics:
       {{ .Values.annotations.nextcloudNotifyPush.serviceMetrics | toYaml | nindent 6 }}
 
 podAnnotations:
-  {{ .Values.annotations.nextcloudNotifyPush.pod | toYaml | nindent 4 }}
+  intents.otterize.com/service-name: "opendesk-nextcloud-notifypush"
+  {{- with .Values.annotations.nextcloudNotifyPush.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 podSecurityContext:
   fsGroup: 101
 # prometheus:
diff --git a/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl b/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
index 3742bb05..ac0e287d 100644
--- a/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl
@@ -39,7 +39,11 @@ exporter:
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     tag: {{ .Values.images.nextcloudExporter.tag | quote }}
   podAnnotations:
-    {{ .Values.annotations.nextcloudExporter.pod | toYaml | nindent 4 }}
+    prometheus.io/scrape: "true"
+    intents.otterize.com/service-name: "opendesk-nextcloud-exporter"
+    {{- with .Values.annotations.nextcloudExporter.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   prometheus:
     serviceMonitor:
       enabled: {{ .Values.monitoring.prometheus.serviceMonitors.enabled }}
@@ -76,7 +80,7 @@ aio:
             topologyKey: "kubernetes.io/hostname"
 
   additionalAnnotations:
-    intents.otterize.com/service-name: "opendesk-nextcloud-aio"
+    intents.otterize.com/service-name: "opendesk-nextcloud-aio-cron"
     {{- with .Values.annotations.nextcloudAio.additional }}
     {{ . | toYaml | nindent 4 }}
     {{- end }}