From 770c6f210cda49089338b2b2009f4d1956a2005d Mon Sep 17 00:00:00 2001
From: duhow <contacto@duhowpi.net>
Date: Mon, 19 Feb 2024 21:49:30 +0100
Subject: [PATCH] remove namespace

---
 kubernetes/helm/templates/ollama-namespace.yaml   | 4 ----
 kubernetes/helm/templates/ollama-service.yaml     | 3 +--
 kubernetes/helm/templates/ollama-statefulset.yaml | 3 +--
 kubernetes/helm/templates/webui-deployment.yaml   | 3 +--
 kubernetes/helm/templates/webui-ingress.yaml      | 1 -
 kubernetes/helm/templates/webui-pvc.yaml          | 5 ++---
 kubernetes/helm/templates/webui-service.yaml      | 3 +--
 kubernetes/helm/values.yaml                       | 4 +---
 8 files changed, 7 insertions(+), 19 deletions(-)
 delete mode 100644 kubernetes/helm/templates/ollama-namespace.yaml

diff --git a/kubernetes/helm/templates/ollama-namespace.yaml b/kubernetes/helm/templates/ollama-namespace.yaml
deleted file mode 100644
index 59f794477..000000000
--- a/kubernetes/helm/templates/ollama-namespace.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: {{ .Values.namespace }}
\ No newline at end of file
diff --git a/kubernetes/helm/templates/ollama-service.yaml b/kubernetes/helm/templates/ollama-service.yaml
index 54558473a..a993b6189 100644
--- a/kubernetes/helm/templates/ollama-service.yaml
+++ b/kubernetes/helm/templates/ollama-service.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   name: ollama-service
-  namespace: {{ .Values.namespace }}
 spec:
   type: {{ .Values.ollama.service.type }}
   selector:
@@ -10,4 +9,4 @@ spec:
   ports:
   - protocol: TCP
     port: {{ .Values.ollama.servicePort }}
-    targetPort: {{ .Values.ollama.servicePort }}
\ No newline at end of file
+    targetPort: {{ .Values.ollama.servicePort }}
diff --git a/kubernetes/helm/templates/ollama-statefulset.yaml b/kubernetes/helm/templates/ollama-statefulset.yaml
index 83cb6883f..76b1988f9 100644
--- a/kubernetes/helm/templates/ollama-statefulset.yaml
+++ b/kubernetes/helm/templates/ollama-statefulset.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: StatefulSet
 metadata:
   name: ollama
-  namespace: {{ .Values.namespace }}
 spec:
   serviceName: "ollama"
   replicas: {{ .Values.ollama.replicaCount }}
@@ -52,4 +51,4 @@ spec:
       accessModes: [ "ReadWriteOnce" ]
       resources:
         requests:
-          storage: {{ .Values.ollama.volumeSize }}
\ No newline at end of file
+          storage: {{ .Values.ollama.volumeSize }}
diff --git a/kubernetes/helm/templates/webui-deployment.yaml b/kubernetes/helm/templates/webui-deployment.yaml
index 08c966886..af42cecab 100644
--- a/kubernetes/helm/templates/webui-deployment.yaml
+++ b/kubernetes/helm/templates/webui-deployment.yaml
@@ -2,7 +2,6 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: open-webui-deployment
-  namespace: {{ .Values.namespace }}
 spec:
   replicas: 1
   selector:
@@ -35,4 +34,4 @@ spec:
       volumes:
       - name: webui-volume
         persistentVolumeClaim:
-          claimName: open-webui-pvc
\ No newline at end of file
+          claimName: open-webui-pvc
diff --git a/kubernetes/helm/templates/webui-ingress.yaml b/kubernetes/helm/templates/webui-ingress.yaml
index cbd456d3f..28b90dc47 100644
--- a/kubernetes/helm/templates/webui-ingress.yaml
+++ b/kubernetes/helm/templates/webui-ingress.yaml
@@ -3,7 +3,6 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: open-webui-ingress
-  namespace: {{ .Values.namespace }}
 {{- if .Values.webui.ingress.annotations }}
   annotations:
 {{ toYaml .Values.webui.ingress.annotations | trimSuffix "\n" | indent 4 }}
diff --git a/kubernetes/helm/templates/webui-pvc.yaml b/kubernetes/helm/templates/webui-pvc.yaml
index d090fe872..0db77c677 100644
--- a/kubernetes/helm/templates/webui-pvc.yaml
+++ b/kubernetes/helm/templates/webui-pvc.yaml
@@ -1,12 +1,11 @@
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
+  name: open-webui-pvc
   labels:
     app: open-webui
-  name: open-webui-pvc
-  namespace: {{ .Values.namespace }}  
 spec:
   accessModes: [ "ReadWriteOnce" ]
   resources:
     requests:
-      storage: {{ .Values.webui.volumeSize }}
\ No newline at end of file
+      storage: {{ .Values.webui.volumeSize }}
diff --git a/kubernetes/helm/templates/webui-service.yaml b/kubernetes/helm/templates/webui-service.yaml
index afd526a15..8a96bd152 100644
--- a/kubernetes/helm/templates/webui-service.yaml
+++ b/kubernetes/helm/templates/webui-service.yaml
@@ -2,7 +2,6 @@ apiVersion: v1
 kind: Service
 metadata:
   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:
@@ -12,4 +11,4 @@ spec:
       port: {{ .Values.webui.servicePort }}
       targetPort: {{ .Values.webui.servicePort }}
       # If using NodePort, you can optionally specify the nodePort:
-      # nodePort: 30000
\ No newline at end of file
+      # nodePort: 30000
diff --git a/kubernetes/helm/values.yaml b/kubernetes/helm/values.yaml
index 63781f6cc..ff96fa277 100644
--- a/kubernetes/helm/values.yaml
+++ b/kubernetes/helm/values.yaml
@@ -1,5 +1,3 @@
-namespace: open-webui
-
 ollama:
   replicaCount: 1
   image: ollama/ollama:latest
@@ -41,4 +39,4 @@ webui:
   nodeSelector: {}
   tolerations: []
   service:
-    type: NodePort
\ No newline at end of file
+    type: NodePort