[helm kube-etcd] Add ability to not create the etcd serviceMonitor (#1478)

helm/exporter-kube-etcd/Chart.yaml

@@ -1,9 +1,7 @@
 apiVersion: v1
 description: A Helm chart for Kubernetes
 name: exporter-kube-etcd
-version: 0.1.12
+version: 0.1.13
 maintainers:
-  - name: Michael Goodness
-    email: mgoodness@gmail.com
   - name: Giancarlo Rubio
     email: gianrubio@gmail.com

helm/exporter-kube-etcd/templates/servicemonitor.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.serviceMonitor.create }}
 apiVersion: {{ template "prometheus-operator.apiVersion" . }}
 kind: ServiceMonitor
 metadata:
@@ -37,3 +38,4 @@ spec:
       {{- end}}
       insecureSkipVerify: true
     {{- end }}
+{{- end }}

helm/exporter-kube-etcd/values.yaml

@@ -18,3 +18,6 @@ additionalServiceMonitorLabels: {}
 ##Custom Labels to be added to Prometheus Rules ConfigMap
 ##
 additionalRulesConfigMapLabels: {}
+
+serviceMonitor:
+  create: true

helm/kube-prometheus/requirements.yaml

@@ -28,9 +28,10 @@ dependencies:
     condition: deployKubeDNS
 
   - name: exporter-kube-etcd
-    version: 0.1.12
+    version: 0.1.13
     #e2e-repository: file://../exporter-kube-etcd
     repository: https://s3-eu-west-1.amazonaws.com/coreos-charts/stable/
+    condition: deployKubeEtcd
 
   - name: exporter-kube-scheduler
     version: 0.1.8

helm/kube-prometheus/values.yaml

@@ -431,3 +431,4 @@ prometheus:
 # Select Deployed DNS Solution
 deployCoreDNS: false
 deployKubeDNS: true
+deployKubeEtcd: true