DevFW-CICD/ingress-nginx-helm
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use recommended labels and label helpers

Browse source 
Signed-off-by: Naseem <naseem@transit.app>
This commit is contained in:
Naseem 2020-02-26 23:27:28 -05:00
parent d8f84fde6a
commit 003039f23c
No known key found for this signature in database
GPG key ID: 2002385E8036EAAE
37 changed files with 164 additions and 260 deletions
Download patch file Download diff file Expand all files Collapse all files

12
charts/ingress-nginx/templates/controller-servicemonitor.yaml
View file

@ -7,11 +7,8 @@ metadata:
namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }}
{{- end }}
labels:
app: {{ template "nginx-ingress.name" . }}
chart: {{ template "nginx-ingress.chart" . }}
component: "{{ .Values.controller.name }}"
heritage: {{ .Release.Service }}
release: {{ .Release.Name }}
{{- include "nginx-ingress.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }}
{{- if .Values.controller.metrics.serviceMonitor.additionalLabels }}
{{ toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | indent 4 }}
{{- end }}
@ -32,7 +29,6 @@ spec:
{{- end }}
selector:
matchLabels:
app: {{ template "nginx-ingress.name" . }}
component: "{{ .Values.controller.name }}"
release: {{ .Release.Name }}
{{- include "nginx-ingress.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }}
{{- end }}