Updates and incorporating review comments

Signed-off-by: Faisal K <[email protected]>
prometheus-community · Mar 31, 2024 · 6ff0e9b · 6ff0e9b
1 parent 9adef80
commit 6ff0e9b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/charts/prometheus-json-exporter/templates/deployment.yaml b/charts/prometheus-json-exporter/templates/deployment.yaml
@@ -38,13 +38,13 @@ spec:
         {{- toYaml .Values.podSecurityContext | nindent 8 }}
       {{- with .Values.extraInitContainers }}
       initContainers:
-        {{ toYaml . | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       containers:
         - name: {{ .Chart.Name }}
-          {{- if .Values.extraArgs }}
+          {{- with .Values.extraArgs }}
           args:
-          {{- range .Values.extraArgs }}
+          {{- range . }}
           - {{ .name | quote }}
           - {{ .value | quote }}
           {{- end }}

diff --git a/charts/prometheus-json-exporter/templates/servicemonitor.yaml b/charts/prometheus-json-exporter/templates/servicemonitor.yaml
@@ -38,10 +38,9 @@ spec:
       - targetLabel: {{ $targetLabel }}
         replacement: {{ $replacement }}
         {{- end }}
-    {{- $relabelings := .additionalRelabels | default $.Values.serviceMonitor.defaults.additionalRelabels }}
-    {{- if $relabelings }}
+    {{- with .additionalRelabels | default $.Values.serviceMonitor.defaults.additionalRelabels }}
     relabelings:
-    {{- toYaml $relabelings | nindent 6 }}
+    {{- toYaml . | nindent 6 }}
     {{- end }}
   jobLabel: "{{ $.Release.Name }}"
   selector: