This commit fixes false/null fields in the helm charts

Signed-off-by: Cole Kennedy <colek42@gmail.com>

Signed-off-by: Cole Kennedy <colek42@gmail.com>
This commit is contained in:
Cole Kennedy 2019-11-19 19:15:38 -06:00
parent 05aee18619
commit 036d6ea4aa
2 changed files with 5 additions and 3 deletions

View File

@ -88,8 +88,7 @@ roleRef:
kind: Role
name: {{ template "cainjector.fullname" . }}:leaderelection
subjects:
- apiGroup: ""
kind: ServiceAccount
- kind: ServiceAccount
name: {{ include "cainjector.fullname" . }}
namespace: {{ .Release.Namespace }}

View File

@ -32,11 +32,14 @@ spec:
{{- if .Values.podLabels }}
{{ toYaml .Values.podLabels | indent 8 }}
{{- end }}
annotations:
{{- if .Values.podAnnotations }}
annotations:
{{ toYaml .Values.podAnnotations | indent 8 }}
{{- end }}
{{- if and .Values.prometheus.enabled (not .Values.prometheus.servicemonitor.enabled) }}
{{- if not .Values.podAnnotations }}
annotations:
{{- end }}
prometheus.io/path: "/metrics"
prometheus.io/scrape: 'true'
prometheus.io/port: '9402'