From 036d6ea4aac9d6c1b62fd61f9bfcdc6c72bc2ad8 Mon Sep 17 00:00:00 2001 From: Cole Kennedy Date: Tue, 19 Nov 2019 19:15:38 -0600 Subject: [PATCH] This commit fixes false/null fields in the helm charts Signed-off-by: Cole Kennedy Signed-off-by: Cole Kennedy --- deploy/charts/cert-manager/templates/cainjector-rbac.yaml | 3 +-- deploy/charts/cert-manager/templates/deployment.yaml | 5 ++++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/deploy/charts/cert-manager/templates/cainjector-rbac.yaml b/deploy/charts/cert-manager/templates/cainjector-rbac.yaml index aa90ccbf8..6e3ad320b 100644 --- a/deploy/charts/cert-manager/templates/cainjector-rbac.yaml +++ b/deploy/charts/cert-manager/templates/cainjector-rbac.yaml @@ -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 }} diff --git a/deploy/charts/cert-manager/templates/deployment.yaml b/deploy/charts/cert-manager/templates/deployment.yaml index 644c1aa3b..3a27ca690 100644 --- a/deploy/charts/cert-manager/templates/deployment.yaml +++ b/deploy/charts/cert-manager/templates/deployment.yaml @@ -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'