fix: templating extraEnvVariables from values

alercebroker · Sep 27, 2023 · c7d929b · c7d929b
1 parent 41493d8
commit c7d929b
Show file tree

Hide file tree

Showing 25 changed files with 37 additions and 38 deletions.
diff --git a/charts/alert-archive-step/Chart.yaml b/charts/alert-archive-step/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "6.0.0"
 description: A Helm chart for Kubernetes
 name: alert-archive-step
 type: application
-version: 1.2.1
+version: 1.2.2
diff --git a/charts/alert-archive-step/templates/deployment.yaml b/charts/alert-archive-step/templates/deployment.yaml
@@ -68,8 +68,8 @@ spec:
                   name: kafka-auth
                   key: password
             {{- end }}
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/correction-step/Chart.yaml b/charts/correction-step/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "6.0.0"
 description: Correction step chart
 name: correction-step
 type: application
-version: 1.2.2
+version: 1.2.3
diff --git a/charts/correction-step/templates/deployment.yaml b/charts/correction-step/templates/deployment.yaml
@@ -164,8 +164,8 @@ spec:
                   name: kafka-auth
                   key: metrics-password
             {{- end }}
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/feature-step/Chart.yaml b/charts/feature-step/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "6.0.0"
 description: Step for feature calculation
 name: feature-step
 type: application
-version: 1.4.1
+version: 1.4.2
diff --git a/charts/feature-step/templates/deployment.yaml b/charts/feature-step/templates/deployment.yaml
@@ -116,8 +116,8 @@ spec:
                 secretKeyRef:
                   name: kafka-auth
                   key: password
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 14 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/lc-classifier-step/Chart.yaml b/charts/lc-classifier-step/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "6.0.0"
 description: Lightcurve classifier step
 name: lc-classifier-step
 type: application
-version: 4.8.1
+version: 4.8.2
diff --git a/charts/lc-classifier-step/templates/deployment.yaml b/charts/lc-classifier-step/templates/deployment.yaml
@@ -216,8 +216,8 @@ spec:
                 configMapKeyRef:
                   name: {{ include "lc-classifier-step.fullname" . }}
                   key: step-parser-class
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/lightcurve-step/Chart.yaml b/charts/lightcurve-step/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "6.0.0"
 description: Full lightcurve provider step
 name: lightcurve-step
 type: application
-version: 1.3.1
+version: 1.3.2
diff --git a/charts/lightcurve-step/templates/deployment.yaml b/charts/lightcurve-step/templates/deployment.yaml
@@ -152,8 +152,8 @@ spec:
                 configMapKeyRef:
                   name: {{ include "lightcurve-step.fullname" . }}
                   key: pyroscope-server
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/magstats-step/Chart.yaml b/charts/magstats-step/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "6.0.0"
 description: A Helm chart for Kubernetes
 name: magstats-step
 type: application
-version: 1.2.1
+version: 1.2.2
diff --git a/charts/magstats-step/templates/deployment.yaml b/charts/magstats-step/templates/deployment.yaml
@@ -127,8 +127,8 @@ spec:
                   name: kafka-auth
                   key: metrics-password
             {{- end }}
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/prv_candidates/Chart.yaml b/charts/prv_candidates/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "6.0.0"
 description: Previous candidates processor step
 name: prv-candidates
 type: application
-version: 1.3.1
+version: 1.3.2
diff --git a/charts/prv_candidates/templates/deployment.yaml b/charts/prv_candidates/templates/deployment.yaml
@@ -144,8 +144,8 @@ spec:
                   name: kafka-auth
                   key: metrics-password
             {{- end}}
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/scribe/Chart.yaml b/charts/scribe/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.1.1
+version: 1.1.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/scribe/templates/deployment.yaml b/charts/scribe/templates/deployment.yaml
@@ -76,8 +76,8 @@ spec:
                   name: kafka-auth
                   key: metrics-password
             {{- end }}
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/sorting-hat/Chart.yaml b/charts/sorting-hat/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "6.0.0"
 description: Sorting Hat deployment chart
 name: sorting-hat
 type: application
-version: 2.6.1
+version: 2.6.2
diff --git a/charts/sorting-hat/templates/configmap.yaml b/charts/sorting-hat/templates/configmap.yaml
@@ -5,7 +5,6 @@ metadata:
   name: '{{ include "sorting-hat.fullname" . }}'
   namespace: {{ .Values.namespace }}
 data:
-  class-prefix: {{ .Values.configmap.classPrefix }}
   consumer-topics: "{{ .Values.configmap.consumerTopics }}"
   topic-strategy-topic-format: "{{ .Values.configmap.topicStrategy.topicFormat }}"
   topic-strategy-date-format: "{{ .Values.configmap.topicStrategy.dateFormat }}"
@@ -15,7 +14,7 @@ data:
   consumer-class: {{ .Values.configmap.consumerClass }}
   producer-server: {{ .Values.configmap.producerServer }}
   producer-topic: {{ .Values.configmap.producerTopic }}
-  producer-message-max-bytes: {{ .Values.configmap.producerMessageMaxBytes }}
+  producer-message-max-bytes: "{{ .Values.configmap.producerMessageMaxBytes }}"
   pyroscope-server: {{ .Values.configmap.pyroscopeServer }}
   metrics-server: {{ .Values.configmap.metricsServer }}
   metrics-topic: {{ .Values.configmap.metricsTopic }}

diff --git a/charts/sorting-hat/templates/deployment.yaml b/charts/sorting-hat/templates/deployment.yaml
@@ -167,8 +167,8 @@ spec:
                   name: kafka-auth
                   key: metrics-password
             {{- end }}
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/step_starter/Chart.yaml b/charts/step_starter/Chart.yaml
@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.0.1
+version: 1.0.2
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

diff --git a/charts/step_starter/templates/deployment.yaml b/charts/step_starter/templates/deployment.yaml
@@ -90,8 +90,8 @@ spec:
                   name: kafka-auth
                   key: password
             {{- end }}
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/watchlist-step/Chart.yaml b/charts/watchlist-step/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "1.1.4"
 description: A Helm chart for Kubernetes
 name: watchlist-step
 type: application
-version: 1.2.1
+version: 1.2.2
diff --git a/charts/watchlist-step/templates/deployment.yaml b/charts/watchlist-step/templates/deployment.yaml
@@ -130,8 +130,8 @@ spec:
                   name: kafka-auth
                   key: metrics-password
             {{- end }}
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity:

diff --git a/charts/xmatch-step/Chart.yaml b/charts/xmatch-step/Chart.yaml
@@ -3,4 +3,4 @@ appVersion: "6.0.0"
 description: A Helm chart for Kubernetes
 name: xmatch-step
 type: application
-version: 2.3.1
+version: 2.3.2
diff --git a/charts/xmatch-step/templates/deployment.yaml b/charts/xmatch-step/templates/deployment.yaml
@@ -149,8 +149,8 @@ spec:
                   name: kafka-auth
                   key: scribe-password
             {{- end }}
-            {{- with .Values.extraEnvVariables}}
-            {{- toYaml . | nindent 12 }}
+            {{- with .Values.extraEnvVariables }}
+            {{- tpl (toYaml .) $ | nindent 12 }}
             {{- end}}
       {{- with .Values.affinity }}
       affinity: