From 25b61cced098a49ce8fe318099f55616a57c6806 Mon Sep 17 00:00:00 2001
From: MohamedBassem <me@mbassem.com>
Date: Sat, 31 Aug 2024 20:47:47 +0000
Subject: k8s: Drop redis and workers container from k8s templates

---
 kubernetes/kustomization.yaml      | 14 --------------
 kubernetes/redis-deployment.yaml   | 24 -----------------------
 kubernetes/redis-pvc.yaml          | 10 ----------
 kubernetes/redis-service.yaml      | 11 -----------
 kubernetes/web-deployment.yaml     |  9 ++++-----
 kubernetes/workers-deployment.yaml | 39 --------------------------------------
 6 files changed, 4 insertions(+), 103 deletions(-)
 delete mode 100644 kubernetes/redis-deployment.yaml
 delete mode 100644 kubernetes/redis-pvc.yaml
 delete mode 100644 kubernetes/redis-service.yaml
 delete mode 100644 kubernetes/workers-deployment.yaml

(limited to 'kubernetes')

diff --git a/kubernetes/kustomization.yaml b/kubernetes/kustomization.yaml
index 44a51b5d..ca8c85ab 100644
--- a/kubernetes/kustomization.yaml
+++ b/kubernetes/kustomization.yaml
@@ -12,14 +12,10 @@ resources:
 - namespace.yaml
 - web-deployment.yaml
 - web-service.yaml
-- redis-deployment.yaml
-- redis-service.yaml
 - chrome-deployment.yaml
 - chrome-service.yaml
 - meilisearch-deployment.yaml
 - meilisearch-service.yaml
-- workers-deployment.yaml
-- redis-pvc.yaml
 - meilisearch-pvc.yaml
 - data-pvc.yaml
 
@@ -40,13 +36,3 @@ replacements:
       kind: Deployment
       name: web
       version: v1
-  - fieldPaths:
-    - spec.template.spec.containers.0.image
-    options:
-      delimiter: ':'
-      index: 1
-    select:
-      group: apps
-      kind: Deployment
-      name: workers
-      version: v1
diff --git a/kubernetes/redis-deployment.yaml b/kubernetes/redis-deployment.yaml
deleted file mode 100644
index b9665e15..00000000
--- a/kubernetes/redis-deployment.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: redis
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: redis
-  template:
-    metadata:
-      labels:
-        app: redis
-    spec:
-      containers:
-        - name: redis
-          image: redis:7.2-alpine
-          volumeMounts:
-            - mountPath: /data
-              name: redis
-      volumes:
-        - name: redis
-          persistentVolumeClaim:
-            claimName: redis-pvc
\ No newline at end of file
diff --git a/kubernetes/redis-pvc.yaml b/kubernetes/redis-pvc.yaml
deleted file mode 100644
index 81437e5b..00000000
--- a/kubernetes/redis-pvc.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: PersistentVolumeClaim
-metadata:
-  name: redis-pvc
-spec:
-  accessModes:
-    - ReadWriteOnce
-  resources:
-    requests:
-      storage: 1Gi
\ No newline at end of file
diff --git a/kubernetes/redis-service.yaml b/kubernetes/redis-service.yaml
deleted file mode 100644
index f55ae588..00000000
--- a/kubernetes/redis-service.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis
-spec:
-  selector:
-    app: redis
-  ports:
-    - protocol: TCP
-      port: 6379
-      targetPort: 6379
\ No newline at end of file
diff --git a/kubernetes/web-deployment.yaml b/kubernetes/web-deployment.yaml
index d4e28024..c2a5031d 100644
--- a/kubernetes/web-deployment.yaml
+++ b/kubernetes/web-deployment.yaml
@@ -14,18 +14,17 @@ spec:
     spec:
       containers:
         - name: web
-          image: ghcr.io/hoarder-app/hoarder-web:HOARDER_VERSION_PLACEHOLDER
+          image: ghcr.io/hoarder-app/hoarder:HOARDER_VERSION_PLACEHOLDER
           ports:
             - containerPort: 3000
           env:
-            - name: REDIS_HOST
-              value: redis
-            - name: REDIS_PORT
-              value: '6379'
             - name: MEILI_ADDR
               value: http://meilisearch:7700
+            - name: BROWSER_WEB_URL
+              value: http://chrome:9222
             - name: DATA_DIR
               value: /data
+            # Add OPENAI_API_KEY to the ConfigMap if necessary
           volumeMounts:
             - mountPath: /data
               name: data
diff --git a/kubernetes/workers-deployment.yaml b/kubernetes/workers-deployment.yaml
deleted file mode 100644
index ed4ef838..00000000
--- a/kubernetes/workers-deployment.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: workers
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: hoarder-workers
-  template:
-    metadata:
-      labels:
-        app: hoarder-workers
-    spec:
-      containers:
-        - name: workers
-          image: ghcr.io/hoarder-app/hoarder-workers:HOARDER_VERSION_PLACEHOLDER
-          env:
-            - name: REDIS_HOST
-              value: redis
-            - name: REDIS_PORT
-              value: '6379'
-            - name: MEILI_ADDR
-              value: http://meilisearch:7700
-            - name: BROWSER_WEB_URL
-              value: http://chrome:9222
-            - name: DATA_DIR
-              value: /data
-            # Add OPENAI_API_KEY to the ConfigMap if necessary
-          volumeMounts:
-            - mountPath: /data
-              name: data
-          envFrom:
-            - configMapRef:
-                name: hoarder-env
-      volumes:
-        - name: data
-          persistentVolumeClaim:
-            claimName: data-pvc
-- 
cgit v1.2.3-70-g09d2