fix(argo-rollouts): Use annotation cont metrics (#2184)

* fix(argo-rollouts): Use annotation cont metrics Signed-off-by: Artur Mudrykh <a.mudrykh@uzum.com> * fix(argo-rollouts): add changes and bump version Signed-off-by: Artur Mudrykh <a.mudrykh@uzum.com> * fix chart.yaml Signed-off-by: Artur Mudrykh <a.mudrykh@uzum.com> --------- Signed-off-by: Artur Mudrykh <a.mudrykh@uzum.com> Co-authored-by: Artur Mudrykh <a.mudrykh@uzum.com>
argoproj · Jul 25, 2023 · 5f1d08d · 5f1d08d
1 parent f2da20b
commit 5f1d08d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/charts/argo-rollouts/Chart.yaml b/charts/argo-rollouts/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: v1.5.1
 description: A Helm chart for Argo Rollouts
 name: argo-rollouts
-version: 2.31.1
+version: 2.31.2
 home: https://github.com/argoproj/argo-helm
 icon: https://argoproj.github.io/argo-rollouts/assets/logo.png
 keywords:
@@ -18,5 +18,5 @@ annotations:
     fingerprint: 2B8F22F57260EFA67BE1C5824B11F800CD9D2252
     url: https://argoproj.github.io/argo-helm/pgp_keys.asc
   artifacthub.io/changes: |
-    - kind: changed
-      description: Update to app version 1.5.1
+    - kind: fixed
+      description: Fix use prometheus metrics service
diff --git a/charts/argo-rollouts/README.md b/charts/argo-rollouts/README.md
@@ -91,6 +91,7 @@ For full list of changes please check ArtifactHub [changelog].
 | controller.livenessProbe | object | See [values.yaml] | Configure liveness [probe] for the controller |
 | controller.metricProviderPlugins | object | `{}` | Configures 3rd party metric providers for controller |
 | controller.metrics.enabled | bool | `false` | Deploy metrics service |
+| controller.metrics.service.annotations | object | `{}` | Service annotations |
 | controller.metrics.service.port | int | `8090` | Metrics service port |
 | controller.metrics.service.portName | string | `"metrics"` | Metrics service port name |
 | controller.metrics.serviceMonitor.additionalAnnotations | object | `{}` | Annotations to be added to the ServiceMonitor |

diff --git 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
@@ -127,6 +127,8 @@ controller:
       portName: metrics
       # -- Metrics service port
       port: 8090
+      # -- Service annotations
+      annotations: {}
     serviceMonitor:
       # -- Enable a prometheus ServiceMonitor
       enabled: false