From c4975de5dd1a39d5e6a8d3b42667f8d599163d0a Mon Sep 17 00:00:00 2001
From: ili16 <ilijakovac1@googlemail.com>
Date: Fri, 26 Jan 2024 14:10:27 +0100
Subject: [PATCH] cleanup kubernetes manifests

---
 .../modernizer-backend-deployment.yml         |  4 +--
 Kubernetes/modernizer/modernizer-ingress.yml  |  2 +-
 .../ollama/ollama-chatbot-deployment.yml      | 19 -------------
 Kubernetes/ollama/ollama-chatbot-service.yml  | 14 ----------
 Kubernetes/ollama/ollama-deployment.yml       |  2 +-
 Kubernetes/ollama/ollama-webui-deployment.yml | 27 -------------------
 Kubernetes/ollama/ollama-webui-service.yml    | 13 ---------
 7 files changed, 4 insertions(+), 77 deletions(-)
 delete mode 100644 Kubernetes/ollama/ollama-chatbot-deployment.yml
 delete mode 100644 Kubernetes/ollama/ollama-chatbot-service.yml
 delete mode 100644 Kubernetes/ollama/ollama-webui-deployment.yml
 delete mode 100644 Kubernetes/ollama/ollama-webui-service.yml

diff --git a/Kubernetes/modernizer/modernizer-backend-deployment.yml b/Kubernetes/modernizer/modernizer-backend-deployment.yml
index f30f72b..4c3d785 100644
--- a/Kubernetes/modernizer/modernizer-backend-deployment.yml
+++ b/Kubernetes/modernizer/modernizer-backend-deployment.yml
@@ -21,10 +21,10 @@ spec:
         env:
           - name: OLLAMA_URL
             value: "http://ollama-service.ba-kovacevic:11434"
-          - name: WEBUI_URL
-            value: "http://ollama-webui-service.ba-kovacevic:8080"
           - name: WEAVIATE_HOST
             value: "weaviate.ba-kovacevic:80"
+          - name: OLLAMA_MODEL
+            value: "starcoder:3b"
           - name: WEAVIATE_KEY
             valueFrom:
               secretKeyRef:
diff --git a/Kubernetes/modernizer/modernizer-ingress.yml b/Kubernetes/modernizer/modernizer-ingress.yml
index 81e8010..a11e5b2 100644
--- a/Kubernetes/modernizer/modernizer-ingress.yml
+++ b/Kubernetes/modernizer/modernizer-ingress.yml
@@ -28,7 +28,7 @@ spec:
                 name: modernizer-backend-service
                 port:
                   number: 443
-          - path: /debug-ollama(/|$)(.*)
+          - path: /debug(/|$)(.*)
             pathType: Prefix
             backend:
               service:
diff --git a/Kubernetes/ollama/ollama-chatbot-deployment.yml b/Kubernetes/ollama/ollama-chatbot-deployment.yml
deleted file mode 100644
index 8e86514..0000000
--- a/Kubernetes/ollama/ollama-chatbot-deployment.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-# ollama-chatbot-deployment.yaml
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: ollama-chatbot-deployment
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: ollama-chatbot
-  template:
-    metadata:
-      labels:
-        app: ollama-chatbot
-    spec:
-      containers:
-      - name: ollama-chatbot
-        image: ghcr.io/ivanfioravanti/chatbot-ollama:main
diff --git a/Kubernetes/ollama/ollama-chatbot-service.yml b/Kubernetes/ollama/ollama-chatbot-service.yml
deleted file mode 100644
index 2c59bd8..0000000
--- a/Kubernetes/ollama/ollama-chatbot-service.yml
+++ /dev/null
@@ -1,14 +0,0 @@
----
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: ollama-chatbot-service
-spec:
-  selector:
-    app: ollama-chatbot
-  ports:
-    - protocol: TCP
-      port: 443
-      targetPort: 3000
-  type: ClusterIP
diff --git a/Kubernetes/ollama/ollama-deployment.yml b/Kubernetes/ollama/ollama-deployment.yml
index 0bec38e..f3d864b 100644
--- a/Kubernetes/ollama/ollama-deployment.yml
+++ b/Kubernetes/ollama/ollama-deployment.yml
@@ -27,7 +27,7 @@ spec:
           lifecycle:
             postStart:
               exec:
-                command: ["ollama", "run", "codellama:7b-instruct"]
+                command: ["ollama", "run", "starcoder:3b"]
       volumes:
         - name: ollama-volume
           persistentVolumeClaim:
diff --git a/Kubernetes/ollama/ollama-webui-deployment.yml b/Kubernetes/ollama/ollama-webui-deployment.yml
deleted file mode 100644
index 81d4b35..0000000
--- a/Kubernetes/ollama/ollama-webui-deployment.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: ollama-webui-deployment
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: ollama-webui
-  template:
-    metadata:
-      labels:
-        app: ollama-webui
-    spec:
-      containers:
-        - name: ollama-webui
-          image: ghcr.io/ollama-webui/ollama-webui:main
-          ports:
-            - containerPort: 8080
-          resources:
-            limits:
-              cpu: "500m"
-              memory: "500Mi"
-          env:
-            - name: OLLAMA_API_BASE_URL
-              value: "http://ollama-service.ba-kovacevic:11434/api"
-          tty: true
diff --git a/Kubernetes/ollama/ollama-webui-service.yml b/Kubernetes/ollama/ollama-webui-service.yml
deleted file mode 100644
index d86dd87..0000000
--- a/Kubernetes/ollama/ollama-webui-service.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: ollama-webui-service
-spec:
-  selector:
-    app: ollama-webui
-  ports:
-    - protocol: TCP
-      port: 8080
-      targetPort: 8080
-      # If using NodePort, you can optionally specify the nodePort:
-      # nodePort: 30000