From c49d4d83912d4b6be5e770df89c6f92264268af2 Mon Sep 17 00:00:00 2001
From: Ralf Grubenmann <ralf.grubenmann@sdsc.ethz.ch>
Date: Thu, 9 Jan 2025 15:38:40 +0100
Subject: [PATCH] chore: move prometheus annotation to pod

---
 helm-chart/renku/templates/data-service/deployment.yaml | 3 +++
 helm-chart/renku/templates/data-service/service.yaml    | 4 ----
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/helm-chart/renku/templates/data-service/deployment.yaml b/helm-chart/renku/templates/data-service/deployment.yaml
index ec07eb2814..1de478f39b 100644
--- a/helm-chart/renku/templates/data-service/deployment.yaml
+++ b/helm-chart/renku/templates/data-service/deployment.yaml
@@ -26,6 +26,9 @@ spec:
       annotations:
         # NOTE: Without this the pod will not restart when the secret values change.
         checksum/config: {{ include (print $.Template.BasePath "/notebooks/env-secret.yaml") . | sha256sum }}
+        prometheus.io/scrape: 'true'
+        prometheus.io/path: '/metrics'
+        prometheus.io/port: '8000'
       {{- with .Values.dataService.podAnnotations }}
         {{- toYaml . | nindent 8 }}
       {{- end }}
diff --git a/helm-chart/renku/templates/data-service/service.yaml b/helm-chart/renku/templates/data-service/service.yaml
index 0d1ffd1066..f8e43a9269 100644
--- a/helm-chart/renku/templates/data-service/service.yaml
+++ b/helm-chart/renku/templates/data-service/service.yaml
@@ -7,10 +7,6 @@ metadata:
     chart: {{ template "renku.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
-  annotations:
-    prometheus.io/scrape: 'true'
-    prometheus.io/path: '/metrics'
-    prometheus.io/port: '8000'
 spec:
   type: {{ .Values.dataService.service.type }}
   ports: