From 5c438db5550e46c85438d8f8ebbc55fbc44789db Mon Sep 17 00:00:00 2001 From: "Marlapati Venkata Naga Sai Teja[marlapativ]" Date: Sat, 17 Aug 2024 00:03:43 -0400 Subject: [PATCH 1/3] feat: adding imagepullsecrets to open-webui and pipelines --- charts/open-webui/templates/workload-manager.yaml | 4 ++++ charts/open-webui/values.yaml | 7 +++++++ charts/pipelines/templates/deployment.yaml | 6 +++++- charts/pipelines/values.yaml | 7 +++++++ 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/charts/open-webui/templates/workload-manager.yaml b/charts/open-webui/templates/workload-manager.yaml index 70d7ef0..433dd49 100644 --- a/charts/open-webui/templates/workload-manager.yaml +++ b/charts/open-webui/templates/workload-manager.yaml @@ -29,6 +29,10 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} initContainers: - name: copy-app-data {{- with .Values.image }} diff --git a/charts/open-webui/values.yaml b/charts/open-webui/values.yaml index a04e2d0..7bb0fe6 100644 --- a/charts/open-webui/values.yaml +++ b/charts/open-webui/values.yaml @@ -37,6 +37,13 @@ image: repository: ghcr.io/open-webui/open-webui tag: "latest" pullPolicy: "IfNotPresent" + +# -- Configure imagePullSecrets to use private registry +# ref: +imagePullSecrets: [] +# imagePullSecrets: +# - name: myRegistryKeySecretName + resources: {} ingress: enabled: false diff --git a/charts/pipelines/templates/deployment.yaml b/charts/pipelines/templates/deployment.yaml index 24f3c70..accbdb2 100644 --- a/charts/pipelines/templates/deployment.yaml +++ b/charts/pipelines/templates/deployment.yaml @@ -22,6 +22,10 @@ spec: {{- toYaml . | nindent 8 }} {{- end }} spec: + {{- with .Values.imagePullSecrets }} + imagePullSecrets: + {{- toYaml . | nindent 8 }} + {{- end }} enableServiceLinks: false automountServiceAccountToken: false containers: @@ -68,4 +72,4 @@ spec: - name: data persistentVolumeClaim: claimName: {{ include "pipelines.name" . }} - {{- end }} \ No newline at end of file + {{- end }} diff --git a/charts/pipelines/values.yaml b/charts/pipelines/values.yaml index 1ac9f6c..63d5448 100644 --- a/charts/pipelines/values.yaml +++ b/charts/pipelines/values.yaml @@ -10,6 +10,13 @@ image: repository: ghcr.io/open-webui/pipelines tag: main pullPolicy: Always + +# -- Configure imagePullSecrets to use private registry +# ref: +imagePullSecrets: [] +# imagePullSecrets: +# - name: myRegistryKeySecretName + resources: {} ingress: enabled: true From 4256a677f264c9bd10cd6068839656533a2dfebf Mon Sep 17 00:00:00 2001 From: "Marlapati Venkata Naga Sai Teja[marlapativ]" Date: Sat, 17 Aug 2024 00:32:21 -0400 Subject: [PATCH 2/3] fix: chart version update and readme update --- charts/open-webui/Chart.yaml | 2 +- charts/open-webui/README.md | 3 ++- charts/pipelines/Chart.yaml | 2 +- charts/pipelines/README.md | 3 ++- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/charts/open-webui/Chart.yaml b/charts/open-webui/Chart.yaml index 8dee803..32d0263 100644 --- a/charts/open-webui/Chart.yaml +++ b/charts/open-webui/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: open-webui -version: 3.1.4 +version: 3.1.5 appVersion: "0.3.13" home: https://www.openwebui.com/ diff --git a/charts/open-webui/README.md b/charts/open-webui/README.md index cffc4c8..b424957 100644 --- a/charts/open-webui/README.md +++ b/charts/open-webui/README.md @@ -1,6 +1,6 @@ # open-webui -![Version: 3.1.4](https://img.shields.io/badge/Version-3.1.4-informational?style=flat-square) ![AppVersion: 0.3.13](https://img.shields.io/badge/AppVersion-0.3.13-informational?style=flat-square) +![Version: 3.1.5](https://img.shields.io/badge/Version-3.1.5-informational?style=flat-square) ![AppVersion: 0.3.13](https://img.shields.io/badge/AppVersion-0.3.13-informational?style=flat-square) Open WebUI: A User-Friendly Web Interface for Chat Interactions 👋 @@ -46,6 +46,7 @@ helm upgrade --install open-webui open-webui/open-webui | extraEnvVars | list | `[{"name":"OPENAI_API_KEY","value":"0p3n-w3bu!"}]` | Additional environments variables on the output Deployment definition. Most up-to-date environment variables can be found here: https://docs.openwebui.com/getting-started/env-configuration/ | | extraEnvVars[0] | object | `{"name":"OPENAI_API_KEY","value":"0p3n-w3bu!"}` | Default API key value for Pipelines. Should be updated in a production deployment, or be changed to the required API key if not using Pipelines | | image | object | `{"pullPolicy":"IfNotPresent","repository":"ghcr.io/open-webui/open-webui","tag":"latest"}` | Open WebUI image tags can be found here: https://github.com/open-webui/open-webui/pkgs/container/open-webui | +| imagePullSecrets | list | `[]` | Configure imagePullSecrets to use private registry ref: | | ingress.annotations | object | `{}` | Use appropriate annotations for your Ingress controller, e.g., for NGINX: nginx.ingress.kubernetes.io/rewrite-target: / | | ingress.class | string | `""` | | | ingress.enabled | bool | `false` | | diff --git a/charts/pipelines/Chart.yaml b/charts/pipelines/Chart.yaml index d68a655..5d0f650 100644 --- a/charts/pipelines/Chart.yaml +++ b/charts/pipelines/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: pipelines -version: 0.0.3 +version: 0.0.4 appVersion: "alpha" home: https://github.com/open-webui/pipelines diff --git a/charts/pipelines/README.md b/charts/pipelines/README.md index b51c3a7..6054ecf 100644 --- a/charts/pipelines/README.md +++ b/charts/pipelines/README.md @@ -1,6 +1,6 @@ # pipelines -![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![AppVersion: alpha](https://img.shields.io/badge/AppVersion-alpha-informational?style=flat-square) +![Version: 0.0.4](https://img.shields.io/badge/Version-0.0.4-informational?style=flat-square) ![AppVersion: alpha](https://img.shields.io/badge/AppVersion-alpha-informational?style=flat-square) Pipelines: UI-Agnostic OpenAI API Plugin Framework @@ -38,6 +38,7 @@ helm upgrade --install open-webui open-webui/pipelines | image.pullPolicy | string | `"Always"` | | | image.repository | string | `"ghcr.io/open-webui/pipelines"` | | | image.tag | string | `"main"` | | +| imagePullSecrets | list | `[]` | Configure imagePullSecrets to use private registry ref: | | ingress.annotations | object | `{}` | Use appropriate annotations for your Ingress controller, e.g., for NGINX: nginx.ingress.kubernetes.io/rewrite-target: / | | ingress.class | string | `""` | | | ingress.enabled | bool | `true` | | From 80be808ed1bd9773b4f450a0237bed21b0a9fece Mon Sep 17 00:00:00 2001 From: "James W." <104535511+0xThresh@users.noreply.github.com> Date: Sat, 17 Aug 2024 20:09:05 -0700 Subject: [PATCH 3/3] Delay update on Pipelines chart version There's a bug with the Helm releaser Github action that prevents you from releasing multiple charts in the same PR, so I'll merge this PR without updating the chart version and update that in a separate PR to trigger that action. --- charts/pipelines/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/pipelines/Chart.yaml b/charts/pipelines/Chart.yaml index 5d0f650..d68a655 100644 --- a/charts/pipelines/Chart.yaml +++ b/charts/pipelines/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v2 name: pipelines -version: 0.0.4 +version: 0.0.3 appVersion: "alpha" home: https://github.com/open-webui/pipelines