[incubator/zookeeper] fix annotations possibly having null values instead of objects (#17679)

Signed-off-by: Cade Markegard <cademarkegard@gmail.com>

incubator/zookeeper/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v1
 name: zookeeper
 home: https://zookeeper.apache.org/
-version: 2.0.1
+version: 2.0.2
 appVersion: 3.5.5
 description: Centralized service for maintaining configuration information, naming,
   providing distributed synchronization, and providing group services.

incubator/zookeeper/templates/service.yaml

@@ -7,10 +7,12 @@ metadata:
     chart: {{ template "zookeeper.chart" . }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+{{- if .Values.service.annotations }}}
   annotations:
 {{- with .Values.service.annotations }}
 {{ toYaml . | indent 4 }}
 {{- end }}
+{{- end }}
 spec:
   type: {{ .Values.service.type }}
   ports:

incubator/zookeeper/templates/statefulset.yaml

@@ -30,13 +30,13 @@ spec:
         {{ $key }}: {{ $value | quote }}
         {{- end }}
       {{- end }}
+{{- if .Values.podAnnotations }}
       annotations:
-      {{- if .Values.podAnnotations }}
         ## Custom pod annotations
         {{- range $key, $value := .Values.podAnnotations }}
         {{ $key }}: {{ $value | quote }}
         {{- end }}
-      {{- end }}
+{{- end }}
     spec:
       terminationGracePeriodSeconds: {{ .Values.terminationGracePeriodSeconds }}
 {{- if .Values.schedulerName }}