From 74cbd592ade13847cfb20ce6330ac58f051f4b4e Mon Sep 17 00:00:00 2001
From: prettysunflower <me@prettysunflower.moe>
Date: Tue, 3 Jun 2025 21:38:36 +0200
Subject: [PATCH] apps(teable): Moved valkey to teable deployment

---
 apps/teable/deployment.yaml | 51 ++++++++++++-------------------------
 apps/teable/services.yaml   | 15 -----------
 2 files changed, 16 insertions(+), 50 deletions(-)

diff --git a/apps/teable/deployment.yaml b/apps/teable/deployment.yaml
index a734a6e..4618fc3 100644
--- a/apps/teable/deployment.yaml
+++ b/apps/teable/deployment.yaml
@@ -1,40 +1,5 @@
 apiVersion: apps/v1
 kind: Deployment
-metadata:
-  name: valkey
-  namespace: teable
-  labels:
-    app.kubernetes.io/name: valkey
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app.kubernetes.io/name: valkey
-  template:
-    metadata:
-      labels:
-        app.kubernetes.io/name: valkey
-    spec:
-      volumes:
-        - name: valkey-data
-          persistentVolumeClaim:
-            claimName: valkey-data-pvc
-      containers:
-        - image: valkey/valkey:alpine
-          name: valkey
-          envFrom:
-            - secretRef:
-                name: valkey-secrets
-          command: ["valkey-server"]
-          ports:
-            - containerPort: 6379
-              protocol: TCP
-          volumeMounts:
-          - name: valkey-data
-            mountPath: "/data"
----
-apiVersion: apps/v1
-kind: Deployment
 metadata:
   name: teable
   namespace: teable
@@ -60,6 +25,10 @@ spec:
                 operator: In
                 values:
                 - fsn
+      volumes:
+        - name: valkey-data
+          persistentVolumeClaim:
+            claimName: valkey-data-pvc
       initContainers:
         - name: db-migrate
           image: ghcr.io/teableio/teable:latest
@@ -123,3 +92,15 @@ spec:
             timeoutSeconds: 5
             failureThreshold: 3
             successThreshold: 1
+        - image: valkey/valkey:alpine
+          name: valkey
+          envFrom:
+            - secretRef:
+                name: valkey-secrets
+          command: ["valkey-server"]
+          ports:
+            - containerPort: 6379
+              protocol: TCP
+          volumeMounts:
+          - name: valkey-data
+            mountPath: "/data"
diff --git a/apps/teable/services.yaml b/apps/teable/services.yaml
index c687cf7..20ba688 100644
--- a/apps/teable/services.yaml
+++ b/apps/teable/services.yaml
@@ -1,20 +1,5 @@
 apiVersion: v1
 kind: Service
-metadata:
-  name: valkey
-  namespace: teable
-spec:
-  type: ClusterIP
-  selector:
-    app.kubernetes.io/name: valkey
-  ports:
-    - protocol: TCP
-      port: 6379
-      targetPort: 6379
-      name: valkey
----
-apiVersion: v1
-kind: Service
 metadata:
   name: teable
   namespace: teable