Merge pull request #21 from plenti-chris-fowles/main

render env vars as yaml

charts/open-webui/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: open-webui
-version: 2.0.2
+version: 2.1.0
 appVersion: "latest"
 
 home: https://www.openwebui.com/
@@ -8,15 +8,15 @@ icon: https://raw.githubusercontent.com/open-webui/open-webui/main/static/favico
 
 description: "Open WebUI: A User-Friendly Web Interface for Chat Interactions 👋"
 keywords:
-- llm
+  - llm
-- chat
+  - chat
-- web-ui
+  - web-ui
 
 sources:
-- https://github.com/open-webui/helm-charts
+  - https://github.com/open-webui/helm-charts
-- https://github.com/open-webui/open-webui/pkgs/container/open-webui
+  - https://github.com/open-webui/open-webui/pkgs/container/open-webui
-- https://github.com/otwld/ollama-helm/
+  - https://github.com/otwld/ollama-helm/
-- https://hub.docker.com/r/ollama/ollama
+  - https://hub.docker.com/r/ollama/ollama
 
 annotations:
   licenses: MIT
@@ -26,7 +26,6 @@ dependencies:
     repository: https://otwld.github.io/ollama-helm/
     version: ">=0.24.0"
     import-values:
-      
       - child: service
         parent: ollama.service
     condition: ollama.enabled

charts/open-webui/templates/deployment.yaml

@@ -42,11 +42,8 @@ spec:
         env:
         - name: OLLAMA_BASE_URLS
           value: {{ include "ollamaBaseUrls" . | quote }}
-        {{- with .Values.extraEnvVars }}
+        {{- if .Values.extraEnvVars }}
-        {{- range . }}
+          {{- toYaml .Values.extraEnvVars | nindent 8 }}
-        - name: {{ .name }}
-          value: {{ .value | quote }}
-        {{- end }}
         {{- end }}
         tty: true
       {{- with .Values.nodeSelector }}

charts/open-webui/values.yaml

@@ -15,7 +15,6 @@ ollama:
   # persistentVolume:
   #   enabled: true
 
-
 # -- A list of Ollama API endpoints. These can be added in lieu of automatically installing the Ollama Helm chart, or in addition to it.
 ollamaUrls: []
 
@@ -69,6 +68,11 @@ service:
   loadBalancerClass: ""
 
 # -- Additional environments variables on the output Deployment definition.
-extraEnvVars: []
+extraEnvVars:
-#  - name: OLLAMA_DEBUG
+  # - name: OPENAI_API_KEY
-#    value: "1"
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: openai-api-key
+  #       key: api-key
+  # - name: OLLAMA_DEBUG
+  #   value: "1"