[mlrun] Fix Duplications Between extraEnv and extraEnvKeyVal (#999)

Co-authored-by: quaark <a.melnick@icloud.com>
v3io · Aug 23, 2023 · 936c831 · 936c831
1 parent 4e00005
commit 936c831
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/stable/mlrun/Chart.yaml b/stable/mlrun/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: mlrun
-version: 0.9.16
+version: 0.9.17
 appVersion: 1.4.0
 description: Machine Learning automation and tracking
 sources:

diff --git a/stable/mlrun/templates/api-chief-deployment.yaml b/stable/mlrun/templates/api-chief-deployment.yaml
@@ -107,7 +107,12 @@ spec:
             value: {{ .Values.api.sidecars.logCollector.getLogsBufferSizeBytes | quote }}
           {{- end }}
           {{- if .Values.api.extraEnv }}
-          {{ toYaml .Values.api.extraEnv | nindent 10 }}
+          {{- range .Values.api.extraEnv }}
+          {{- if not (hasKey $.Values.api.extraEnvKeyValue .name) }}
+          - name: {{ .name }}
+            value: {{ .value }}
+          {{- end }}
+          {{- end }}
           {{- end }}
           {{- if .Values.api.extraEnvKeyValue }}
           {{- range $name, $value := .Values.api.extraEnvKeyValue }}

diff --git a/stable/mlrun/templates/api-worker-deployment.yaml b/stable/mlrun/templates/api-worker-deployment.yaml
@@ -101,7 +101,12 @@ spec:
             value: {{ .Values.api.sidecars.logCollector.getLogsBufferSizeBytes | quote }}
           {{- end }}
           {{- if .Values.api.extraEnv }}
-          {{ toYaml .Values.api.extraEnv | nindent 10 }}
+          {{- range .Values.api.extraEnv }}
+          {{- if not (hasKey $.Values.api.extraEnvKeyValue .name) }}
+          - name: {{ .name }}
+            value: {{ .value }}
+          {{- end }}
+          {{- end }}
           {{- end }}
           {{- if .Values.api.extraEnvKeyValue }}
           {{- range $name, $value := .Values.api.extraEnvKeyValue }}