Merge pull request #2383 from colek42/fix-2375-falsy-fields

Fixes false/null fields in the helm chart.

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 }}
 

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'