fix: env var + bump iam version

datalayer · Dec 17, 2024 · 947e7d7 · 947e7d7
1 parent 998f427
commit 947e7d7
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 15 deletions.
diff --git a/charts/datalayer-iam/README.md b/charts/datalayer-iam/README.md
@@ -64,7 +64,7 @@ For full documentation please checkout [Datalayer Tech](https://datalayer.tech).
 | iam.env.OTEL_EXPORTER_OTLP_METRICS_ENDPOINT | string | `""` |  |
 | iam.env.OTEL_EXPORTER_OTLP_TRACES_ENDPOINT | string | `""` |  |
 | iam.env.OTEL_SDK_DISABLED | string | `"false"` |  |
-| iam.image | string | `"datalayer/iam:1.0.5"` |  |
+| iam.image | string | `"datalayer/iam:1.0.6"` |  |
 | iam.imagePullPolicy | string | `"Always"` |  |
 | iam.ingressClass | string | `"datalayer-traefik"` |  |
 | iam.port | int | `9700` |  |

diff --git a/charts/datalayer-iam/templates/deployment.yaml b/charts/datalayer-iam/templates/deployment.yaml
@@ -40,12 +40,10 @@ spec:
           env:
             {{- range $key, $value := .Values.iam.env }}
             - name: {{ $key }}
-              {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-              {{- else if kindIs "map" $value }}
+              {{- if kindIs "map" $value }}
               valueFrom: {{- $value | toYaml | nindent 16}}
               {{- else }}
-              {{- fail "Env value must be either string or map with key secretKeyRef or configMapKeyRef" }}
+              value: {{ $value | quote }}
               {{- end }}
             {{- end }}
           {{- end }}

diff --git a/charts/datalayer-iam/tests/deployment_test.yaml b/charts/datalayer-iam/tests/deployment_test.yaml
@@ -130,7 +130,7 @@ tests:
                 value: ""
               - name: OTEL_SDK_DISABLED
                 value: "false"
-            image: datalayer/iam:1.0.5
+            image: datalayer/iam:1.0.6
             imagePullPolicy: Always
             name: iam
             ports:

diff --git a/charts/datalayer-iam/values.yaml b/charts/datalayer-iam/values.yaml
@@ -1,5 +1,5 @@
 iam:
-  image: datalayer/iam:1.0.5
+  image: datalayer/iam:1.0.6
   imagePullPolicy: Always
   port: 9700
   sidecar:

diff --git a/charts/datalayer-jupyter/templates/deployment.yaml b/charts/datalayer-jupyter/templates/deployment.yaml
@@ -41,12 +41,10 @@ spec:
           env:
             {{- range $key, $value := .Values.jupyter.env }}
             - name: {{ $key }}
-              {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-              {{- else if kindIs "map" $value }}
+              {{- if kindIs "map" $value }}
               valueFrom: {{- $value | toYaml | nindent 16}}
               {{- else }}
-              {{- fail "Env value must be either string or map with key secretKeyRef or configMapKeyRef" }}
+              value: {{ $value | quote }}
               {{- end }}
             {{- end }}
           {{- end }}

diff --git a/charts/datalayer-operator/templates/deployment.yaml b/charts/datalayer-operator/templates/deployment.yaml
@@ -49,12 +49,10 @@ spec:
             {{- end }}
             {{- range $key, $value := .Values.operator.env }}
             - name: {{ $key }}
-              {{- if kindIs "string" $value }}
-              value: {{ $value | quote }}
-              {{- else if kindIs "map" $value }}
+              {{- if kindIs "map" $value }}
               valueFrom: {{- $value | toYaml | nindent 16}}
               {{- else }}
-              {{- fail "Env value must be either string or map with key secretKeyRef or configMapKeyRef" }}
+              value: {{ $value | quote }}
               {{- end }}
             {{- end }}
           {{- end }}