From a9805df7efb85eae8444ecabc2ac810567f26b3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20J=C3=B8rgensen?= Date: Sat, 17 Feb 2024 14:18:45 +0100 Subject: [PATCH 1/6] open-webui --- kubernetes/helm/Chart.yaml | 2 +- kubernetes/helm/values.yaml | 2 +- kubernetes/manifest/base/ollama-service.yaml | 2 +- kubernetes/manifest/base/ollama-statefulset.yaml | 2 +- .../manifest/base/{ollama-namespace.yaml => open-webui.yaml} | 2 +- kubernetes/manifest/base/webui-deployment.yaml | 4 ++-- kubernetes/manifest/base/webui-ingress.yaml | 2 +- kubernetes/manifest/base/webui-service.yaml | 2 +- kubernetes/manifest/kustomization.yaml | 2 +- kubernetes/manifest/patches/ollama-statefulset-gpu.yaml | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) rename kubernetes/manifest/base/{ollama-namespace.yaml => open-webui.yaml} (63%) diff --git a/kubernetes/helm/Chart.yaml b/kubernetes/helm/Chart.yaml index 52683b65e..a5e686e98 100644 --- a/kubernetes/helm/Chart.yaml +++ b/kubernetes/helm/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 -name: ollama-webui +name: open-webui description: "Ollama Web UI: A User-Friendly Web Interface for Chat Interactions 👋" version: 1.0.0 icon: https://raw.githubusercontent.com/ollama-webui/ollama-webui/main/static/favicon.png diff --git a/kubernetes/helm/values.yaml b/kubernetes/helm/values.yaml index 648b40509..efb78d1e6 100644 --- a/kubernetes/helm/values.yaml +++ b/kubernetes/helm/values.yaml @@ -1,4 +1,4 @@ -namespace: ollama-namespace +namespace: open-webui ollama: replicaCount: 1 diff --git a/kubernetes/manifest/base/ollama-service.yaml b/kubernetes/manifest/base/ollama-service.yaml index a9467fc44..8bab65b59 100644 --- a/kubernetes/manifest/base/ollama-service.yaml +++ b/kubernetes/manifest/base/ollama-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: ollama-service - namespace: ollama-namespace + namespace: open-webui spec: selector: app: ollama diff --git a/kubernetes/manifest/base/ollama-statefulset.yaml b/kubernetes/manifest/base/ollama-statefulset.yaml index ee63faa95..125e0c622 100644 --- a/kubernetes/manifest/base/ollama-statefulset.yaml +++ b/kubernetes/manifest/base/ollama-statefulset.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: ollama - namespace: ollama-namespace + namespace: open-webui spec: serviceName: "ollama" replicas: 1 diff --git a/kubernetes/manifest/base/ollama-namespace.yaml b/kubernetes/manifest/base/open-webui.yaml similarity index 63% rename from kubernetes/manifest/base/ollama-namespace.yaml rename to kubernetes/manifest/base/open-webui.yaml index f296eb206..9c1a599f3 100644 --- a/kubernetes/manifest/base/ollama-namespace.yaml +++ b/kubernetes/manifest/base/open-webui.yaml @@ -1,4 +1,4 @@ apiVersion: v1 kind: Namespace metadata: - name: ollama-namespace \ No newline at end of file + name: open-webui \ No newline at end of file diff --git a/kubernetes/manifest/base/webui-deployment.yaml b/kubernetes/manifest/base/webui-deployment.yaml index 58de03680..24e91d60d 100644 --- a/kubernetes/manifest/base/webui-deployment.yaml +++ b/kubernetes/manifest/base/webui-deployment.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: Deployment metadata: name: ollama-webui-deployment - namespace: ollama-namespace + namespace: open-webui spec: replicas: 1 selector: @@ -24,5 +24,5 @@ spec: memory: "500Mi" env: - name: OLLAMA_API_BASE_URL - value: "http://ollama-service.ollama-namespace.svc.cluster.local:11434/api" + value: "http://ollama-service.open-webui.svc.cluster.local:11434/api" tty: true \ No newline at end of file diff --git a/kubernetes/manifest/base/webui-ingress.yaml b/kubernetes/manifest/base/webui-ingress.yaml index 0038807cb..f3c7d545c 100644 --- a/kubernetes/manifest/base/webui-ingress.yaml +++ b/kubernetes/manifest/base/webui-ingress.yaml @@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: name: ollama-webui-ingress - namespace: ollama-namespace + namespace: open-webui #annotations: # Use appropriate annotations for your Ingress controller, e.g., for NGINX: # nginx.ingress.kubernetes.io/rewrite-target: / diff --git a/kubernetes/manifest/base/webui-service.yaml b/kubernetes/manifest/base/webui-service.yaml index b41daeafb..04bf57d7d 100644 --- a/kubernetes/manifest/base/webui-service.yaml +++ b/kubernetes/manifest/base/webui-service.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Service metadata: name: ollama-webui-service - namespace: ollama-namespace + namespace: open-webui spec: type: NodePort # Use LoadBalancer if you're on a cloud that supports it selector: diff --git a/kubernetes/manifest/kustomization.yaml b/kubernetes/manifest/kustomization.yaml index a4b03d961..f581839e8 100644 --- a/kubernetes/manifest/kustomization.yaml +++ b/kubernetes/manifest/kustomization.yaml @@ -1,5 +1,5 @@ resources: -- base/ollama-namespace.yaml +- base/open-webui.yaml - base/ollama-service.yaml - base/ollama-statefulset.yaml - base/webui-deployment.yaml diff --git a/kubernetes/manifest/patches/ollama-statefulset-gpu.yaml b/kubernetes/manifest/patches/ollama-statefulset-gpu.yaml index 54e5aba65..3e4244365 100644 --- a/kubernetes/manifest/patches/ollama-statefulset-gpu.yaml +++ b/kubernetes/manifest/patches/ollama-statefulset-gpu.yaml @@ -2,7 +2,7 @@ apiVersion: apps/v1 kind: StatefulSet metadata: name: ollama - namespace: ollama-namespace + namespace: open-webui spec: selector: matchLabels: From be3400e3f8e93f94463d7e349003232601d860fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20J=C3=B8rgensen?= Date: Sat, 17 Feb 2024 21:18:21 +0100 Subject: [PATCH 2/6] rename more --- kubernetes/helm/Chart.yaml | 4 ++-- kubernetes/helm/templates/webui-deployment.yaml | 10 +++++----- kubernetes/helm/templates/webui-ingress.yaml | 4 ++-- kubernetes/helm/templates/webui-pvc.yaml | 4 ++-- kubernetes/helm/templates/webui-service.yaml | 4 ++-- kubernetes/helm/values.yaml | 4 ++-- kubernetes/manifest/base/ollama-service.yaml | 2 +- kubernetes/manifest/base/webui-deployment.yaml | 2 +- kubernetes/manifest/base/webui-ingress.yaml | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/kubernetes/helm/Chart.yaml b/kubernetes/helm/Chart.yaml index a5e686e98..64d0bd202 100644 --- a/kubernetes/helm/Chart.yaml +++ b/kubernetes/helm/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 name: open-webui -description: "Ollama Web UI: A User-Friendly Web Interface for Chat Interactions 👋" +description: "open-webui UI: A User-Friendly Web Interface for Chat Interactions 👋" version: 1.0.0 -icon: https://raw.githubusercontent.com/ollama-webui/ollama-webui/main/static/favicon.png +icon: https://github.com/open-webui/open-webui/blob/main/static/favicon.png diff --git a/kubernetes/helm/templates/webui-deployment.yaml b/kubernetes/helm/templates/webui-deployment.yaml index d9721ee05..08c966886 100644 --- a/kubernetes/helm/templates/webui-deployment.yaml +++ b/kubernetes/helm/templates/webui-deployment.yaml @@ -1,20 +1,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: ollama-webui-deployment + name: open-webui-deployment namespace: {{ .Values.namespace }} spec: replicas: 1 selector: matchLabels: - app: ollama-webui + app: open-webui template: metadata: labels: - app: ollama-webui + app: open-webui spec: containers: - - name: ollama-webui + - name: open-webui image: {{ .Values.webui.image }} ports: - containerPort: 8080 @@ -35,4 +35,4 @@ spec: volumes: - name: webui-volume persistentVolumeClaim: - claimName: ollama-webui-pvc \ No newline at end of file + claimName: open-webui-pvc \ No newline at end of file diff --git a/kubernetes/helm/templates/webui-ingress.yaml b/kubernetes/helm/templates/webui-ingress.yaml index 84f819f37..cbd456d3f 100644 --- a/kubernetes/helm/templates/webui-ingress.yaml +++ b/kubernetes/helm/templates/webui-ingress.yaml @@ -2,7 +2,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: ollama-webui-ingress + name: open-webui-ingress namespace: {{ .Values.namespace }} {{- if .Values.webui.ingress.annotations }} annotations: @@ -17,7 +17,7 @@ spec: pathType: Prefix backend: service: - name: ollama-webui-service + name: open-webui-service port: number: {{ .Values.webui.servicePort }} {{- end }} diff --git a/kubernetes/helm/templates/webui-pvc.yaml b/kubernetes/helm/templates/webui-pvc.yaml index e9961aa8d..d090fe872 100644 --- a/kubernetes/helm/templates/webui-pvc.yaml +++ b/kubernetes/helm/templates/webui-pvc.yaml @@ -2,8 +2,8 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: labels: - app: ollama-webui - name: ollama-webui-pvc + app: open-webui + name: open-webui-pvc namespace: {{ .Values.namespace }} spec: accessModes: [ "ReadWriteOnce" ] diff --git a/kubernetes/helm/templates/webui-service.yaml b/kubernetes/helm/templates/webui-service.yaml index 7fefa4fd4..afd526a15 100644 --- a/kubernetes/helm/templates/webui-service.yaml +++ b/kubernetes/helm/templates/webui-service.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: ollama-webui-service + name: open-webui-service namespace: {{ .Values.namespace }} spec: type: {{ .Values.webui.service.type }} # Default: NodePort # Use LoadBalancer if you're on a cloud that supports it selector: - app: ollama-webui + app: open-webui ports: - protocol: TCP port: {{ .Values.webui.servicePort }} diff --git a/kubernetes/helm/values.yaml b/kubernetes/helm/values.yaml index efb78d1e6..997dbba1a 100644 --- a/kubernetes/helm/values.yaml +++ b/kubernetes/helm/values.yaml @@ -19,7 +19,7 @@ ollama: webui: replicaCount: 1 - image: ghcr.io/ollama-webui/ollama-webui:main + image: ghcr.io/open-webui/open-webui:main servicePort: 8080 resources: limits: @@ -30,7 +30,7 @@ webui: annotations: # Use appropriate annotations for your Ingress controller, e.g., for NGINX: # nginx.ingress.kubernetes.io/rewrite-target: / - host: ollama.minikube.local + host: open-webui.minikube.local volumeSize: 1Gi nodeSelector: {} tolerations: [] diff --git a/kubernetes/manifest/base/ollama-service.yaml b/kubernetes/manifest/base/ollama-service.yaml index 8bab65b59..10b122474 100644 --- a/kubernetes/manifest/base/ollama-service.yaml +++ b/kubernetes/manifest/base/ollama-service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: ollama-service + name: open-webui-service namespace: open-webui spec: selector: diff --git a/kubernetes/manifest/base/webui-deployment.yaml b/kubernetes/manifest/base/webui-deployment.yaml index 24e91d60d..e04eb94e4 100644 --- a/kubernetes/manifest/base/webui-deployment.yaml +++ b/kubernetes/manifest/base/webui-deployment.yaml @@ -15,7 +15,7 @@ spec: spec: containers: - name: ollama-webui - image: ghcr.io/ollama-webui/ollama-webui:main + image: ghcr.io/open-webui/open-webui:main ports: - containerPort: 8080 resources: diff --git a/kubernetes/manifest/base/webui-ingress.yaml b/kubernetes/manifest/base/webui-ingress.yaml index f3c7d545c..57588de0e 100644 --- a/kubernetes/manifest/base/webui-ingress.yaml +++ b/kubernetes/manifest/base/webui-ingress.yaml @@ -8,7 +8,7 @@ metadata: # nginx.ingress.kubernetes.io/rewrite-target: / spec: rules: - - host: ollama.minikube.local + - host: open-webui.minikube.local http: paths: - path: / From 3e1639be3cd0294cc815814f15ced241f230c3b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20J=C3=B8rgensen?= Date: Sat, 17 Feb 2024 21:22:57 +0100 Subject: [PATCH 3/6] fix link for icon --- kubernetes/helm/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm/Chart.yaml b/kubernetes/helm/Chart.yaml index 64d0bd202..71857e992 100644 --- a/kubernetes/helm/Chart.yaml +++ b/kubernetes/helm/Chart.yaml @@ -2,4 +2,4 @@ apiVersion: v2 name: open-webui description: "open-webui UI: A User-Friendly Web Interface for Chat Interactions 👋" version: 1.0.0 -icon: https://github.com/open-webui/open-webui/blob/main/static/favicon.png +icon: https://raw.githubusercontent.com/open-webui/open-webui/main/static/favicon.png From 74b0e7996d979b2107ec1659597d947f1155a166 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20J=C3=B8rgensen?= Date: Sat, 17 Feb 2024 21:30:47 +0100 Subject: [PATCH 4/6] back to ollama for olllama stuff --- kubernetes/manifest/base/ollama-service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/manifest/base/ollama-service.yaml b/kubernetes/manifest/base/ollama-service.yaml index 10b122474..8bab65b59 100644 --- a/kubernetes/manifest/base/ollama-service.yaml +++ b/kubernetes/manifest/base/ollama-service.yaml @@ -1,7 +1,7 @@ apiVersion: v1 kind: Service metadata: - name: open-webui-service + name: ollama-service namespace: open-webui spec: selector: From cf3e8accd675f64504bb5c5c6ea51b5f7a812cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20J=C3=B8rgensen?= Date: Sat, 17 Feb 2024 21:35:01 +0100 Subject: [PATCH 5/6] rename to Open WebUI: --- kubernetes/helm/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kubernetes/helm/Chart.yaml b/kubernetes/helm/Chart.yaml index 71857e992..c35338c84 100644 --- a/kubernetes/helm/Chart.yaml +++ b/kubernetes/helm/Chart.yaml @@ -1,5 +1,5 @@ apiVersion: v2 name: open-webui -description: "open-webui UI: A User-Friendly Web Interface for Chat Interactions 👋" +description: "Open WebUI: A User-Friendly Web Interface for Chat Interactions 👋" version: 1.0.0 icon: https://raw.githubusercontent.com/open-webui/open-webui/main/static/favicon.png From 82194a5df94d0d16b79c0c3c9fc1637c512e3f5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20J=C3=B8rgensen?= Date: Sat, 17 Feb 2024 21:54:12 +0100 Subject: [PATCH 6/6] more renaming --- kubernetes/manifest/base/webui-deployment.yaml | 8 ++++---- kubernetes/manifest/base/webui-ingress.yaml | 4 ++-- kubernetes/manifest/base/webui-service.yaml | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/kubernetes/manifest/base/webui-deployment.yaml b/kubernetes/manifest/base/webui-deployment.yaml index e04eb94e4..bd2c22736 100644 --- a/kubernetes/manifest/base/webui-deployment.yaml +++ b/kubernetes/manifest/base/webui-deployment.yaml @@ -1,20 +1,20 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: ollama-webui-deployment + name: open-webui-deployment namespace: open-webui spec: replicas: 1 selector: matchLabels: - app: ollama-webui + app: open-webui template: metadata: labels: - app: ollama-webui + app: open-webui spec: containers: - - name: ollama-webui + - name: open-webui image: ghcr.io/open-webui/open-webui:main ports: - containerPort: 8080 diff --git a/kubernetes/manifest/base/webui-ingress.yaml b/kubernetes/manifest/base/webui-ingress.yaml index 57588de0e..dc0b53ccd 100644 --- a/kubernetes/manifest/base/webui-ingress.yaml +++ b/kubernetes/manifest/base/webui-ingress.yaml @@ -1,7 +1,7 @@ apiVersion: networking.k8s.io/v1 kind: Ingress metadata: - name: ollama-webui-ingress + name: open-webui-ingress namespace: open-webui #annotations: # Use appropriate annotations for your Ingress controller, e.g., for NGINX: @@ -15,6 +15,6 @@ spec: pathType: Prefix backend: service: - name: ollama-webui-service + name: open-webui-service port: number: 8080 diff --git a/kubernetes/manifest/base/webui-service.yaml b/kubernetes/manifest/base/webui-service.yaml index 04bf57d7d..d73845f00 100644 --- a/kubernetes/manifest/base/webui-service.yaml +++ b/kubernetes/manifest/base/webui-service.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: ollama-webui-service + name: open-webui-service namespace: open-webui spec: type: NodePort # Use LoadBalancer if you're on a cloud that supports it selector: - app: ollama-webui + app: open-webui ports: - protocol: TCP port: 8080