From e35831abe105431221d88b8c1f2d015056653f3f Mon Sep 17 00:00:00 2001
From: Artur Mudrykh <a.mudrykh@uzum.com>
Date: Mon, 24 Jul 2023 14:57:58 +0300
Subject: [PATCH] fix(argo-rollouts): Use annotation cont metrics

Signed-off-by: Artur Mudrykh <a.mudrykh@uzum.com>
---
 .../argo-rollouts/templates/controller/metrics-service.yaml  | 5 ++++-
 charts/argo-rollouts/values.yaml                             | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/charts/argo-rollouts/templates/controller/metrics-service.yaml b/charts/argo-rollouts/templates/controller/metrics-service.yaml
index e04d326a..671a0837 100644
--- a/charts/argo-rollouts/templates/controller/metrics-service.yaml
+++ b/charts/argo-rollouts/templates/controller/metrics-service.yaml
@@ -7,8 +7,11 @@ metadata:
   labels:
     app.kubernetes.io/component: {{ .Values.controller.component }}
     {{- include "argo-rollouts.labels" . | nindent 4 }}
-  {{- with .Values.serviceAnnotations }}
   annotations:
+  {{- with .Values.serviceAnnotations }}
+    {{- toYaml . | nindent 4 }}
+  {{- end }}
+  {{- with .Values.controller.metrics.service.annotations }}
     {{- toYaml . | nindent 4 }}
   {{- end }}
 spec:
diff --git a/charts/argo-rollouts/values.yaml b/charts/argo-rollouts/values.yaml
index b81ee53a..f9d8e1cf 100644
--- a/charts/argo-rollouts/values.yaml
+++ b/charts/argo-rollouts/values.yaml
@@ -127,6 +127,8 @@ controller:
       portName: metrics
       # -- Metrics service port
       port: 8090
+      # -- Service annotations
+      annotations: {}
     serviceMonitor:
       # -- Enable a prometheus ServiceMonitor
       enabled: false