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

Hardcode component names.

Browse source 
By removing this, we reduce unecessary config options and moving parts.

Signed-off-by: Naseem <naseem@transit.app>
This commit is contained in:
Naseem 2020-03-03 21:53:23 -05:00
parent 99419c75bc
commit 5ae314bd64
No known key found for this signature in database
GPG key ID: 2002385E8036EAAE
39 changed files with 97 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,13 +2,13 @@
apiVersion: monitoring.coreos.com/v1
kind: ServiceMonitor
metadata:
name: {{ template "ingress-nginx.controller.fullname" . }}
name: {{ include "ingress-nginx.controller.fullname" . }}
{{- if .Values.controller.metrics.serviceMonitor.namespace }}
namespace: {{ .Values.controller.metrics.serviceMonitor.namespace }}
{{- end }}
labels:
{{- include "ingress-nginx.labels" . | nindent 4 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }}
app.kubernetes.io/component: controller
{{- if .Values.controller.metrics.serviceMonitor.additionalLabels }}
{{- toYaml .Values.controller.metrics.serviceMonitor.additionalLabels | nindent 4 }}
{{- end }}
@ -29,5 +29,5 @@ spec:
selector:
matchLabels:
{{- include "ingress-nginx.selectorLabels" . | nindent 6 }}
app.kubernetes.io/component: {{ .Values.controller.name | quote }}
app.kubernetes.io/component: controller
{{- end }}