Fix difference between selector labels in serviceMonitor and service (#…

…108) * FIX selector * FIX selector labels Added labels that exists in service, but doesn't exist in service monitor * Added missed label helm.sh/from * Update service.yaml * Update service.yaml * Update servicemonitor.yaml
mvisonneau · May 28, 2020 · e4b9009 · e4b9009
1 parent 9c42b77
commit e4b9009
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/chart/templates/service.yaml b/chart/templates/service.yaml
@@ -9,7 +9,8 @@ metadata:
     helm.sh/chart: {{ include "app.chart" . }}
     app.kubernetes.io/instance: {{ .Release.Name }}
     app.kubernetes.io/managed-by: {{ .Release.Service }}
-{{ with .Values.service.labels }}{{ toYaml . | indent 4 }}{{ end }}
+    helm.sh/from: deploy.{{ include "app.fullname" . }}
+    {{- with .Values.service.labels }}{{ toYaml . | nindent 4 }}{{ end }}
   {{- with .Values.service.annotations }}
   annotations: {{ toYaml . | nindent 4 }}
   {{- end }}

diff --git a/chart/templates/servicemonitor.yaml b/chart/templates/servicemonitor.yaml
@@ -17,8 +17,12 @@ spec:
   selector:
     matchLabels:
       app.kubernetes.io/name: {{ include "app.name" . }}
+      app.kubernetes.io/version: {{ .Chart.AppVersion }}
+      helm.sh/chart: {{ include "app.chart" . }}
       app.kubernetes.io/instance: {{ .Release.Name }}
+      app.kubernetes.io/managed-by: {{ .Release.Service }}
       helm.sh/from: deploy.{{ include "app.fullname" . }}
+      {{- with .Values.service.labels }}{{ toYaml . | nindent 6 }}{{ end }}
   endpoints:
     - port: metrics
       interval: {{ .Values.serviceMonitor.scrapeInterval }}