Ensured the service monitor was behind a toggle

Stono · Jul 14, 2020 · e51a89b · e51a89b
1 parent 293f7ff
commit e51a89b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/helmfile/charts/kconmon/templates/agent/service.yaml b/helmfile/charts/kconmon/templates/agent/service.yaml
@@ -1,9 +1,9 @@
+{{ if .Values.prometheus.enableServiceMonitor }}
 apiVersion: v1
 kind: Service
 metadata:
   labels:
 {{ include "kconmon.app.labels.standard" . | indent 4 }}
-    app: kconmon
     component: agent
   name: agent
 spec:
@@ -17,3 +17,4 @@ spec:
     component: agent
   sessionAffinity: None
   type: ClusterIP
+{{ end }}
diff --git a/helmfile/charts/kconmon/templates/agent/servicemonitor.yaml b/helmfile/charts/kconmon/templates/agent/servicemonitor.yaml
@@ -1,8 +1,9 @@
+{{ if .Values.prometheus.enableServiceMonitor }}
 apiVersion: monitoring.coreos.com/v1
 kind: ServiceMonitor
 metadata:
   labels:
-    app: kconmon
+{{ include "kconmon.app.labels.standard" . | indent 4 }}
   name: kconmon-service-monitor
   namespace: kconmon
 spec:
@@ -16,3 +17,4 @@ spec:
     matchLabels:
       app: kconmon
       component: agent
+{{ end }}
diff --git a/helmfile/charts/kconmon/values.yaml b/helmfile/charts/kconmon/values.yaml
@@ -43,3 +43,7 @@ resources:
     # The minimum value is 25m
     cpu: 70m
     memory: 45Mi
+
+prometheus:
+  # If you wish to create a service and a service monitor because you're using the prometheus operator, change this to true
+  enableServiceMonitor: false