From 3bbdd54e7341b42fae63cca141b417273adc1f2a Mon Sep 17 00:00:00 2001
From: Sergey Shaykhullin <sergeyshaykhullin@gmail.com>
Date: Fri, 21 May 2021 10:23:44 +0300
Subject: [PATCH] Remove path from values

Signed-off-by: Sergey Shaykhullin <sergeyshaykhullin@gmail.com>
---
 .../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 ----
 5 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
index 19037c59..0b943982 100644
--- a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
@@ -20,9 +20,7 @@ spec:
       {{- with .Values.controller.metrics.serviceMonitor.interval }}
       interval: {{ . }}
       {{- end }}
-      {{- with .Values.controller.metrics.serviceMonitor.path }}
-      path: {{ . }}
-      {{- end }}
+      path: /metrics
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
diff --git a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
index 73db755d..05b38acc 100644
--- a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
@@ -20,9 +20,7 @@ spec:
       {{- with .Values.controller.metrics.serviceMonitor.interval }}
       interval: {{ . }}
       {{- end }}
-      {{- with .Values.controller.metrics.serviceMonitor.path }}
-      path: {{ . }}
-      {{- end }}
+      path: /metrics
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
diff --git a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
index a1800f22..00002faa 100644
--- a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
@@ -20,9 +20,7 @@ spec:
       {{- with .Values.controller.metrics.serviceMonitor.interval }}
       interval: {{ . }}
       {{- end }}
-      {{- with .Values.controller.metrics.serviceMonitor.path }}
-      path: {{ . }}
-      {{- end }}
+      path: /metrics
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
diff --git a/charts/argo-cd/templates/dex/servicemonitor.yaml b/charts/argo-cd/templates/dex/servicemonitor.yaml
index 0d42c79a..58bae6e2 100644
--- a/charts/argo-cd/templates/dex/servicemonitor.yaml
+++ b/charts/argo-cd/templates/dex/servicemonitor.yaml
@@ -20,9 +20,7 @@ spec:
       {{- with .Values.controller.metrics.serviceMonitor.interval }}
       interval: {{ . }}
       {{- end }}
-      {{- with .Values.controller.metrics.serviceMonitor.path }}
-      path: {{ . }}
-      {{- end }}
+      path: /metrics
   namespaceSelector:
     matchNames:
       - {{ .Release.Namespace }}
diff --git a/charts/argo-cd/values.yaml b/charts/argo-cd/values.yaml
index 4e889cd1..066857e5 100755
--- a/charts/argo-cd/values.yaml
+++ b/charts/argo-cd/values.yaml
@@ -144,7 +144,6 @@ controller:
     serviceMonitor:
       enabled: false
       interval: 30s
-      path: /metrics
     #   selector:
     #     prometheus: kube-prometheus
     #   namespace: monitoring
@@ -206,7 +205,6 @@ dex:
     serviceMonitor:
       enabled: false
       interval: 30s
-      path: /metrics
 
   image:
     repository: quay.io/dexidp/dex
@@ -495,7 +493,6 @@ server:
     serviceMonitor:
       enabled: false
       interval: 30s
-      path: /metrics
     #   selector:
     #     prometheus: kube-prometheus
     #   namespace: monitoring
@@ -845,7 +842,6 @@ repoServer:
     serviceMonitor:
       enabled: false
       interval: 30s
-      path: /metrics
     #   selector:
     #     prometheus: kube-prometheus
     #   namespace: monitoring