From ed873508eccadac94f7831af6e73c87f8c01efef Mon Sep 17 00:00:00 2001
From: Igor Churmeev <ingvarch@gmail.com>
Date: Thu, 5 Dec 2019 05:47:15 +0200
Subject: [PATCH] [charts/argo-cd] Fix servicemonitors (#180)

* Fixed servicemonitor templates
* Bump chart version
Signed-off-by: Igor Churmeev <igor.churmeev@gatech.global>
---
 charts/argo-cd/Chart.yaml                                    | 2 +-
 .../argocd-application-controller/servicemonitor.yaml        | 5 ++++-
 .../argo-cd/templates/argocd-repo-server/servicemonitor.yaml | 5 ++++-
 charts/argo-cd/templates/argocd-server/servicemonitor.yaml   | 5 ++++-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/charts/argo-cd/Chart.yaml b/charts/argo-cd/Chart.yaml
index b757833c..3c5c02b2 100644
--- a/charts/argo-cd/Chart.yaml
+++ b/charts/argo-cd/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v1
 appVersion: "1.3.0"
 description: A Helm chart for ArgoCD, a declarative, GitOps continuous delivery tool for Kubernetes.
 name: argo-cd
-version: 1.3.0
+version: 1.3.1
 home: https://github.com/argoproj/argo-helm
 icon: https://raw.githubusercontent.com/argoproj/argo/master/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 c820e3bb..3fb538e3 100644
--- a/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-application-controller/servicemonitor.yaml
@@ -13,7 +13,9 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.controller.name }}
+    {{- if .Values.controller.metrics.serviceMonitor.selector }}
 {{- toYaml .Values.controller.metrics.serviceMonitor.selector | nindent 4 }}
+    {{- end }}
     {{- if .Values.controller.metrics.serviceMonitor.additionalLabels }}
 {{- toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | nindent 4 }}
     {{- end }}
@@ -29,4 +31,5 @@ spec:
     matchLabels:
       app.kubernetes.io/name: {{ include "argo-cd.name" . }}-metrics
       app.kubernetes.io/component: {{ .Values.controller.name }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+
diff --git a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
index bd064f17..c07769f9 100644
--- a/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-repo-server/servicemonitor.yaml
@@ -13,7 +13,9 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.repoServer.name }}
+    {{- if .Values.repoServer.metrics.serviceMonitor.selector }}
 {{- toYaml .Values.repoServer.metrics.serviceMonitor.selector | nindent 4 }}
+    {{- end }}
     {{- if .Values.repoServer.metrics.serviceMonitor.additionalLabels }}
 {{- toYaml .Values.repoServer.metrics.serviceMonitor.additionalLabels | nindent 4 }}
     {{- end }}
@@ -30,4 +32,5 @@ spec:
       app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/name: {{ template "argo-cd.repoServer.fullname" . }}-metrics
       app.kubernetes.io/component: {{ .Values.repoServer.name }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+
diff --git a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
index 6d995ff7..7be1f2f4 100644
--- a/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
+++ b/charts/argo-cd/templates/argocd-server/servicemonitor.yaml
@@ -13,7 +13,9 @@ metadata:
     app.kubernetes.io/managed-by: {{ .Release.Service }}
     app.kubernetes.io/part-of: argocd
     app.kubernetes.io/component: {{ .Values.server.name }}
+    {{- if .Values.server.metrics.serviceMonitor.selector }}
 {{- toYaml .Values.server.metrics.serviceMonitor.selector | nindent 4 }}
+    {{- end }}
     {{- if .Values.server.metrics.serviceMonitor.additionalLabels }}
 {{- toYaml .Values.server.metrics.serviceMonitor.additionalLabels | nindent 4 }}
     {{- end }}
@@ -30,4 +32,5 @@ spec:
       app.kubernetes.io/instance: {{ .Release.Name }}
       app.kubernetes.io/name: {{ include "argo-cd.name" . }}-{{ .Values.server.name }}-metrics
       app.kubernetes.io/component: {{ .Values.server.name }}
-{{- end }}
\ No newline at end of file
+{{- end }}
+