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,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:

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:

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:

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:

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:

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