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

render env vars as yaml
This commit is contained in:
Timothy Jaeryang Baek 2024-05-27 16:32:01 -07:00 committed by GitHub
commit 2c51864489
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 19 additions and 19 deletions

View File

@ -1,6 +1,6 @@
apiVersion: v2
name: open-webui
version: 2.0.2
version: 2.1.0
appVersion: "latest"
home: https://www.openwebui.com/
@ -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

View File

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

View File

@ -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: OPENAI_API_KEY
# valueFrom:
# secretKeyRef:
# name: openai-api-key
# key: api-key
# - name: OLLAMA_DEBUG
# value: "1"