chore: merge pod labels and annotations with common labels and annota…

…tions (#139)
hypertrace · Sep 25, 2024 · ac09307 · ac09307
1 parent 0dfb06a
commit ac09307
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/helm/templates/hypertrace-collector/deployment.yaml b/helm/templates/hypertrace-collector/deployment.yaml
@@ -25,18 +25,12 @@ spec:
         prometheus.io/path: "/metrics"
         prometheus.io/port: "8888"
         prometheus.io/scrape: "true"
-        {{- with .Values.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- with .Values.commonPodAnnotations }}
+        {{- with merge .Values.podAnnotations .Values.commonPodAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
       labels:
         release: {{ .Release.Name }}
-        {{- with .Values.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- with .Values.commonPodLabels }}
+        {{- with merge .Values.podLabels .Values.commonPodLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec:

diff --git a/helm/templates/hypertrace-metrics-collector/deployment.yaml b/helm/templates/hypertrace-metrics-collector/deployment.yaml
@@ -26,18 +26,12 @@ spec:
         prometheus.io/path: "/metrics"
         prometheus.io/port: "8888"
         prometheus.io/scrape: "true"
-        {{- with .Values.metrics.podAnnotations }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- with .Values.commonPodAnnotations }}
+        {{- with merge .Values.metrics.podAnnotations .Values.commonPodAnnotations }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
       labels:
         release: {{ .Release.Name }}
-        {{- with .Values.metrics.podLabels }}
-        {{- toYaml . | nindent 8 }}
-        {{- end }}
-        {{- with .Values.commonPodLabels }}
+        {{- with merge .Values.metrics.podLabels .Values.commonPodLabels }}
         {{- toYaml . | nindent 8 }}
         {{- end }}
     spec: