update

datalayer · Dec 16, 2024 · be8490c · be8490c
1 parent 3e2fa5b
commit be8490c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/charts/datalayer-iam/templates/deployment.yaml b/charts/datalayer-iam/templates/deployment.yaml
@@ -36,15 +36,15 @@ spec:
           ports:
             - containerPort: {{ .Values.iam.port }}
               protocol: TCP
-          {{- if or .Values.iam.env .Values.iam.envValueFrom }}
+          {{- if .Values.iam.env }}
           env:
-            {{- range $key, $value := .Values.iam.envValueFrom }}
-            - name: {{ $key }}
-              valueFrom: {{- $value | toYaml | nindent 16 }}
-            {{- end }}
             {{- range $key, $value := .Values.iam.env }}
             - name: {{ $key }}
+              {{- if kindIs "string" $value }}
               value: {{ $value | quote }}
+              {{- else }}
+              valueFrom: {{- $value | toYaml | nindent 16}}
+              {{- end }}
             {{- end }}
           {{- end }}
           {{- with .Values.iam.resources }}

diff --git a/charts/datalayer-jupyter/templates/deployment.yaml b/charts/datalayer-jupyter/templates/deployment.yaml
@@ -37,15 +37,15 @@ spec:
           ports:
             - containerPort: {{ .Values.jupyter.port }}
               protocol: TCP
-          {{- if or .Values.jupyter.env .Values.jupyter.envValueFrom }}
+          {{- if .Values.jupyter.env }}
           env:
-            {{- range $key, $value := .Values.jupyter.envValueFrom }}
-            - name: {{ $key }}
-              valueFrom: {{- $value | toYaml | nindent 16 }}
-            {{- end }}
             {{- range $key, $value := .Values.jupyter.env }}
             - name: {{ $key }}
+              {{- if kindIs "string" $value }}
               value: {{ $value | quote }}
+              {{- else }}
+              valueFrom: {{- $value | toYaml | nindent 16}}
+              {{- end }}
             {{- end }}
           {{- end }}
           {{- with .Values.jupyter.resources }}

diff --git a/charts/datalayer-operator/templates/deployment.yaml b/charts/datalayer-operator/templates/deployment.yaml
@@ -41,19 +41,19 @@ spec:
           ports:
             - containerPort: {{ .Values.operator.port }}
               protocol: TCP
-          {{- if or .Values.operator.sharedFsPVC .Values.operator.env .Values.operator.envValueFrom }}
+          {{- if or .Values.operator.sharedFsPVC .Values.operator.env }}
           env:
             {{- if .Values.operator.sharedFsPVC }}
             - name: 'DATALAYER_USERS_VOLUME_CLAIM_NAME'
               value: {{ .Values.operator.sharedFsPVC }}
             {{- end }}
-            {{- range $key, $value := .Values.operator.envValueFrom }}
-            - name: {{ $key }}
-              valueFrom: {{- $value | toYaml | nindent 16 }}
-            {{- end }}
             {{- range $key, $value := .Values.operator.env }}
             - name: {{ $key }}
+              {{- if kindIs "string" $value }}
               value: {{ $value | quote }}
+              {{- else }}
+              valueFrom: {{- $value | toYaml | nindent 16}}
+              {{- end }}
             {{- end }}
           {{- end }}
           readinessProbe: