From b971b36317c25c3926661c1012eddacca8de2fcb Mon Sep 17 00:00:00 2001
From: Sergey Shaykhullin <46970457+sergeyshaykhullin@users.noreply.github.com>
Date: Fri, 21 May 2021 15:43:10 +0300
Subject: [PATCH] feat(argo-cd): Extract ServiceMonitor interval to values
 (#739)

* Extract interval and path to values

Signed-off-by: Sergey Shaykhullin <sergeyshaykhullin@gmail.com>

* Bump chart

Signed-off-by: Sergey Shaykhullin <sergeyshaykhullin@gmail.com>

* Remove path from values

Signed-off-by: Sergey Shaykhullin <sergeyshaykhullin@gmail.com>
---
 charts/argo-cd/Chart.yaml                                     | 2 +-
 .../argocd-application-controller/servicemonitor.yaml         | 4 +++-
 .../argo-cd/templates/argocd-repo-server/servicemonitor.yaml  | 4 +++-
 charts/argo-cd/templates/argocd-server/servicemonitor.yaml    | 4 +++-
 charts/argo-cd/templates/dex/servicemonitor.yaml              | 4 +++-
 charts/argo-cd/values.yaml                                    | 4 ++++
 6 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index f4cb6e67..75e7cdba 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 appVersion: 2.0.1
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 3.3.5
+version: 3.4.0
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/docs/assets/argo.png
 keywords:
diff --git a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
index 51f81030..0b943982 100644
--- a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
@@ -17,7 +17,9 @@ metadata:
 spec:
   endpoints:
     - port: metrics
-      interval: 30s
+      {{- with .Values.controller.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
       path: /metrics
   namespaceSelector:
     matchNames:
diff --git a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
index 0b343750..05b38acc 100644
--- a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
@@ -17,7 +17,9 @@ metadata:
 spec:
   endpoints:
     - port: metrics
-      interval: 30s
+      {{- with .Values.controller.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
       path: /metrics
   namespaceSelector:
     matchNames:
diff --git a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
index ddf52efa..00002faa 100644
--- a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
@@ -17,7 +17,9 @@ metadata:
 spec:
   endpoints:
     - port: metrics
-      interval: 30s
+      {{- with .Values.controller.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
       path: /metrics
   namespaceSelector:
     matchNames:
diff --git a/charts/argo-cd/templates/dex/servicemonitor.yaml b/charts/argo-cd/templates/dex/servicemonitor.yaml
index adc3394a..58bae6e2 100644
--- a/charts/argo-cd/templates/dex/servicemonitor.yaml
+++ b/charts/argo-cd/templates/dex/servicemonitor.yaml
@@ -17,7 +17,9 @@ metadata:
 spec:
   endpoints:
     - port: metrics
-      interval: 30s
+      {{- with .Values.controller.metrics.serviceMonitor.interval }}
+      interval: {{ . }}
+      {{- end }}
       path: /metrics
   namespaceSelector:
     matchNames:
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index f1ddd6d3..066857e5 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -143,6 +143,7 @@ controller:
       servicePort: 8082
     serviceMonitor:
       enabled: false
+      interval: 30s
     #   selector:
     #     prometheus: kube-prometheus
     #   namespace: monitoring
@@ -203,6 +204,7 @@ dex:
       labels: {}
     serviceMonitor:
       enabled: false
+      interval: 30s
 
   image:
     repository: quay.io/dexidp/dex
@@ -490,6 +492,7 @@ server:
       servicePort: 8083
     serviceMonitor:
       enabled: false
+      interval: 30s
     #   selector:
     #     prometheus: kube-prometheus
     #   namespace: monitoring
@@ -838,6 +841,7 @@ repoServer:
       servicePort: 8084
     serviceMonitor:
       enabled: false
+      interval: 30s
     #   selector:
     #     prometheus: kube-prometheus
     #   namespace: monitoring