fix: fix the service monitor label selector (#215)
This patch does the following: 1. Use "cadvisor.selectorLabels" to select services in the ServiceMonitor 2. Make spacing consistent across templates Signed-off-by: Oleh Neichev <oleg.neichev@gmail.com>
This commit is contained in:
parent
0813fbf1cf
commit
f6d8c39f96
|
|
@ -1,7 +1,7 @@
|
||||||
apiVersion: v1
|
apiVersion: v1
|
||||||
description: A chart for a Cadvisor deployment
|
description: A chart for a Cadvisor deployment
|
||||||
name: cadvisor
|
name: cadvisor
|
||||||
version: 2.4.0
|
version: 2.4.1
|
||||||
appVersion: 0.52.1
|
appVersion: 0.52.1
|
||||||
home: https://github.com/google/cadvisor
|
home: https://github.com/google/cadvisor
|
||||||
sources:
|
sources:
|
||||||
|
|
|
||||||
|
|
@ -82,4 +82,3 @@ spec:
|
||||||
tolerations:
|
tolerations:
|
||||||
{{ toYaml . | indent 8 }}
|
{{ toYaml . | indent 8 }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -9,7 +9,7 @@ metadata:
|
||||||
spec:
|
spec:
|
||||||
selector:
|
selector:
|
||||||
matchLabels:
|
matchLabels:
|
||||||
app: {{ template "cadvisor.name" . }}
|
{{- include "cadvisor.selectorLabels" . | nindent 6 }}
|
||||||
namespaceSelector:
|
namespaceSelector:
|
||||||
matchNames:
|
matchNames:
|
||||||
- {{ .Release.Namespace }}
|
- {{ .Release.Namespace }}
|
||||||
|
|
@ -27,4 +27,3 @@ spec:
|
||||||
{{- toYaml .Values.metrics.metricRelabelings | nindent 8 }}
|
{{- toYaml .Values.metrics.metricRelabelings | nindent 8 }}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue