chore: merge pod labels and annotations with common labels and annotations (#41)

Author: ravisingal

kafka-topic-creator/helm/templates/kafka-topic-creation-hook.yaml

@@ -13,20 +13,12 @@ spec:
     metadata:
       labels:
         app: {{ .Values.jobName }}
-        {{- with .Values.podLabels }}
+        {{- with merge .Values.podLabels .Values.commonPodLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with .Values.commonPodLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      {{- if or .Values.podAnnotations .Values.commonPodAnnotations }}
+      {{- with merge .Values.podAnnotations .Values.commonPodAnnotations }}
       annotations:
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end}}
-        {{- with .Values.commonPodAnnotations }}
         {{- toYaml . | nindent 8 }}
-        {{- end}}
       {{- end }}
     spec:
       containers:

kstreams-app-version-checker/helm/templates/job.yaml

@@ -18,20 +18,12 @@ spec:
       labels:
         app: {{ $jobName }}
         release: {{ .Release.Name }}
-        {{- with .Values.podLabels}}
+        {{- with merge .Values.podLabels .Values.commonPodLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
-        {{- with .Values.commonPodLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-      {{- if or .Values.podAnnotations .Values.commonPodAnnotations }}
+      {{- with merge .Values.podAnnotations .Values.commonPodAnnotations }}
       annotations:
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end}}
-        {{- with .Values.commonPodAnnotations }}
         {{- toYaml . | nindent 8 }}
-        {{- end}}
       {{- end }}
     spec:
       {{- with .Values.podSecurityContext }}