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

render env vars as yaml

CONTRIBUTING.md

@@ -0,0 +1,33 @@
+# Contributing to the Open WebUI Helm Charts
+
+## How to Contribute
+
+1. **Fork the repository** and create your branch from `main`.
+2. **Make your changes** and ensure they follow the guidelines below.
+3. **Test your changes** locally to ensure everything works as expected. This should include deploying your updates to a live Kubernetes cluster (whether local or remote).
+4. **Commit your changes** using a descriptive commit message that follows the [Conventional Commits](https://www.conventionalcommits.org/en/v1.0.0/) specification.
+5. **Push your changes** to your forked repository.
+6. **Create a Pull Request** and provide a detailed description of your changes. Please consider dropping us your redacted `values.yaml` file used during your testing in the PR so we can make sure we see consistent results. 
+
+## Guidelines
+
+- **Semantic Versioning**: This repository follows [Semantic Versioning](https://semver.org/) for versioning the Helm Charts. When making changes, please ensure that you update the version in the `Chart.yaml` file according to the following rules:
+  - `MAJOR` version increment for incompatible chart changes
+  - `MINOR` version increment for backwards-compatible functionality additions
+  - `PATCH` version increment for backwards-compatible bug fixes
+
+- **Chart.yaml Updates**: When submitting a Pull Request, ensure that you have updated the `Chart.yaml` file with the appropriate version increment and a brief description of the changes in the `appVersion` field.
+
+- **Code Style**: Follow the existing code style and conventions used in the repository.
+
+- **Documentation**: If your changes require documentation updates, please include them in your Pull Request.
+
+- **Testing**: Before submitting your Pull Request, ensure that your changes work as expected by testing them locally. This should include deploying your updates to a live Kubernetes cluster (whether local or remote).
+
+- **Issues**: If you find any issues or have suggestions for improvements, please create a new issue in the repository before working on a Pull Request.
+
+## Getting Help
+
+If you need any help or have questions about contributing, feel free to reach out to the maintainers of the repository.
+
+Thank you for your contributions!

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
-- chat
-- web-ui
+  - llm
+  - chat
+  - web-ui
 
 sources:
-- https://github.com/open-webui/helm-charts
-- https://github.com/open-webui/open-webui/pkgs/container/open-webui
-- https://github.com/otwld/ollama-helm/
-- https://hub.docker.com/r/ollama/ollama
+  - https://github.com/open-webui/helm-charts
+  - https://github.com/open-webui/open-webui/pkgs/container/open-webui
+  - https://github.com/otwld/ollama-helm/
+  - 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 }}
-        {{- range . }}
-        - name: {{ .name }}
-          value: {{ .value | quote }}
-        {{- end }}
+        {{- if .Values.extraEnvVars }}
+          {{- toYaml .Values.extraEnvVars | nindent 8 }}
         {{- 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: []
 
@@ -45,7 +44,7 @@ persistence:
   existingClaim: ""
   # -- If using multiple replicas, you must update accessModes to ReadWriteMany
   accessModes:
-  - ReadWriteOnce
+    - ReadWriteOnce
   storageClass: ""
   selector: {}
   annotations: {}
@@ -69,6 +68,11 @@ service:
   loadBalancerClass: ""
 
 # -- Additional environments variables on the output Deployment definition.
-extraEnvVars: []
-#  - name: OLLAMA_DEBUG
-#    value: "1"
+extraEnvVars:
+  # - name: OPENAI_API_KEY
+  #   valueFrom:
+  #     secretKeyRef:
+  #       name: openai-api-key
+  #       key: api-key
+  # - name: OLLAMA_DEBUG
+  #   value: "1"