From c7d929ba0569091284698f09582d708f68d1fb91 Mon Sep 17 00:00:00 2001 From: Diego Rodriguez Date: Wed, 27 Sep 2023 16:20:29 -0300 Subject: [PATCH] fix: templating extraEnvVariables from values --- charts/alert-archive-step/Chart.yaml | 2 +- charts/alert-archive-step/templates/deployment.yaml | 4 ++-- charts/correction-step/Chart.yaml | 2 +- charts/correction-step/templates/deployment.yaml | 4 ++-- charts/feature-step/Chart.yaml | 2 +- charts/feature-step/templates/deployment.yaml | 4 ++-- charts/lc-classifier-step/Chart.yaml | 2 +- charts/lc-classifier-step/templates/deployment.yaml | 4 ++-- charts/lightcurve-step/Chart.yaml | 2 +- charts/lightcurve-step/templates/deployment.yaml | 4 ++-- charts/magstats-step/Chart.yaml | 2 +- charts/magstats-step/templates/deployment.yaml | 4 ++-- charts/prv_candidates/Chart.yaml | 2 +- charts/prv_candidates/templates/deployment.yaml | 4 ++-- charts/scribe/Chart.yaml | 2 +- charts/scribe/templates/deployment.yaml | 4 ++-- charts/sorting-hat/Chart.yaml | 2 +- charts/sorting-hat/templates/configmap.yaml | 3 +-- charts/sorting-hat/templates/deployment.yaml | 4 ++-- charts/step_starter/Chart.yaml | 2 +- charts/step_starter/templates/deployment.yaml | 4 ++-- charts/watchlist-step/Chart.yaml | 2 +- charts/watchlist-step/templates/deployment.yaml | 4 ++-- charts/xmatch-step/Chart.yaml | 2 +- charts/xmatch-step/templates/deployment.yaml | 4 ++-- 25 files changed, 37 insertions(+), 38 deletions(-) diff --git a/charts/alert-archive-step/Chart.yaml b/charts/alert-archive-step/Chart.yaml index dbbcd95..5254bbf 100644 --- 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 index 624a54a..1024e5e 100644 --- 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 index f98032f..82087db 100644 --- 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 index c9125b2..43a12bc 100644 --- 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 index 92dfacf..8500a80 100644 --- 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 index 214ff1c..5e5c652 100644 --- 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 index d4c22f8..4034309 100644 --- 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 index 10eb010..e375fff 100644 --- 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 index 557ff7d..7e1367c 100644 --- 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 index 9dae6c5..e9e23f4 100644 --- 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 index 5592926..8ca9ab8 100644 --- 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 index a3c719b..96ad630 100644 --- 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 index 1786817..320886c 100644 --- 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 index 52b98bc..9e92e06 100644 --- 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 index e581cd2..8e35251 100644 --- 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 index fd105b9..7a21b8f 100644 --- 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 index ec2fdd7..254afbd 100644 --- 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 index e1a5863..e7b5c97 100644 --- 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 index 3ccd573..8c5b2ab 100644 --- 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 index 7a92b73..0fe8908 100644 --- 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 index 6b8f260..ee8caac 100644 --- 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 index 6c578ea..63adb75 100644 --- 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 index 51313e3..f13d82d 100644 --- 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 index ed94c29..9e7c24d 100644 --- 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 index 2fedb9d..f16a10f 100644 --- 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: