Merge branch 'main' into alexnederlof-allow-service-accounts

.github/workflows/helm-release.yml

@@ -8,42 +8,42 @@ on:
       - "charts/**"
 
 jobs:
-  semantic-release:
+  # semantic-release:
-    runs-on: ubuntu-latest
+  #   runs-on: ubuntu-latest
-    steps:
+  #   steps:
-      # Checkout repo
+  #     # Checkout repo
-      - name: Checkout
+  #     - name: Checkout
-        uses: actions/checkout@v4
+  #       uses: actions/checkout@v4
 
-      - name: Setup Node.js
+  #     - name: Setup Node.js
-        uses: actions/setup-node@v3
+  #       uses: actions/setup-node@v3
-        with:
+  #       with:
-          node-version: 'lts/*'
+  #         node-version: 'lts/*'
-      - name: Install dependencies
+  #     - name: Install dependencies
-        run: npm install
+  #       run: npm install
-      - name: Release
+  #     - name: Release
-        env:
+  #       env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  #         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: npx semantic-release
+  #       run: npx semantic-release
 
-      - name: Install yq
+  #     - name: Install yq
-        run: |
+  #       run: |
-          wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O yq &&\
+  #         wget https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64 -O yq &&\
-          chmod +x yq
+  #         chmod +x yq
 
-      - name: Get version
+  #     - name: Get version
-        id: get_version
+  #       id: get_version
-        run: |
+  #       run: |
-          echo "VERSION=$(cat charts/open-webui/Chart.yaml | ./yq -r  '.version')" >> $GITHUB_OUTPUT
+  #         echo "VERSION=$(cat charts/open-webui/Chart.yaml | ./yq -r  '.version')" >> $GITHUB_OUTPUT
 
-      - name: Commit Chart.yaml
+  #     - name: Commit Chart.yaml
-        uses: stefanzweifel/git-auto-commit-action@v4
+  #       uses: stefanzweifel/git-auto-commit-action@v4
-        with:
+  #       with:
-          commit_message: 'chore(release) bump version to ${{ steps.get_version.outputs.VERSION }}'
+  #         commit_message: 'chore(release) bump version to ${{ steps.get_version.outputs.VERSION }}'
-          file_pattern: 'charts/open-webui/Chart.yaml'
+  #         file_pattern: 'charts/open-webui/Chart.yaml'
 
   release:
-    needs: semantic-release
+    #needs: semantic-release
     permissions:
       contents: write
       packages: write

charts/open-webui/Chart.lock

@@ -1,12 +1,12 @@
 dependencies:
 - name: ollama
   repository: https://otwld.github.io/ollama-helm/
-  version: 0.65.0
+  version: 0.67.0
 - name: pipelines
   repository: https://helm.openwebui.com
   version: 0.0.4
 - name: tika
   repository: https://apache.jfrog.io/artifactory/tika
   version: 2.9.0
-digest: sha256:c9405bba567364144f432f81c1c7c77336002eb8d6d07ae4fc5362cf2e3471b6
+digest: sha256:fac9d8b93937791cd066e983ae12f7d5d57adc9b3e8c8e4854fd68ebdef54237
-generated: "2024-11-10T14:18:47.252585-07:00"
+generated: "2024-11-24T12:42:43.794305-07:00"

charts/open-webui/Chart.yaml

@@ -1,7 +1,7 @@
 apiVersion: v2
 name: open-webui
-version: 4.0.0
+version: 4.0.1
-appVersion: 0.4.0
+appVersion: 0.4.2
 home: https://www.openwebui.com/
 icon: >-
   https://raw.githubusercontent.com/open-webui/open-webui/main/static/favicon.png

charts/open-webui/templates/ingress.yaml

@@ -17,6 +17,9 @@ spec:
   tls:
     - hosts:
       - {{ .Values.ingress.host | quote }}
+      {{- range .Values.ingress.additionalHosts }}
+      - {{ . | quote }}
+      {{- end }}
       secretName: {{ default (printf "%s-tls" .Release.Name) .Values.ingress.existingSecret }}
   {{- end }}
   rules:
@@ -30,4 +33,16 @@ spec:
             name: {{ include "open-webui.name" . }}
             port:
               name: http
+  {{- range .Values.ingress.additionalHosts }}
+  - host: {{ . | quote }}
+    http:
+      paths:
+      - path: /
+        pathType: Prefix
+        backend:
+          service:
+            name: {{ include "open-webui.name" $ }}
+            port:
+              name: http
+  {{- end }}
 {{- end }}

charts/open-webui/templates/workload-manager.yaml

@@ -41,6 +41,9 @@ spec:
         {{- end }}
         command: ['sh', '-c', 'cp -R -n /app/backend/data/* /tmp/app-data/']
         {{- with .Values.containerSecurityContext }}
+        {{- with .Values.copy-app-data.resources }}
+        resources: {{- toYaml . | nindent 10 }}
+        {{- end }}
         securityContext:
           {{- toYaml . | nindent 10 }}
         {{- end }}

charts/open-webui/values.yaml

@@ -63,6 +63,7 @@ ingress:
   # nginx.ingress.kubernetes.io/rewrite-target: /
   annotations: {}
   host: ""
+  additionalHosts: []
   tls: false
   existingSecret: ""
 persistence:
@@ -149,6 +150,7 @@ podSecurityContext:
   # supplementalGroups: []
   # fsGroup: 1001
 
+
 # -- Configure container security context
 # ref: <https://kubernetes.io/docs/tasks/configure-pod-container/security-context/#set-the-security-context-for-a-containe>
 containerSecurityContext: