From 35ebb55893bd24df96c971bcb161b3def14b2b44 Mon Sep 17 00:00:00 2001
From: zyc <1439655764@qq.com>
Date: Wed, 25 Mar 2026 13:32:47 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=88=87=E6=8D=A2=20Celery=20broke?=
 =?UTF-8?q?r=20=E4=B8=BA=E9=98=BF=E9=87=8C=E4=BA=91=20Redis=EF=BC=8C?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4=E8=87=AA=E5=BB=BA=20Redis=20Pod?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

复用现有阿里云 Tair 实例（db8），减少集群内 Pod 数量和运维负担。

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
---
 .gitea/workflows/deploy.yaml |  5 ++---
 backend/config/settings.py   |  2 +-
 k8s/backend-deployment.yaml  |  2 +-
 k8s/celery-deployment.yaml   |  2 +-
 k8s/redis-deployment.yaml    | 40 ------------------------------------
 5 files changed, 5 insertions(+), 46 deletions(-)
 delete mode 100644 k8s/redis-deployment.yaml

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index f0cf377..6b6d8c9 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -65,7 +65,7 @@ jobs:
           sed -i "s|\${CI_REGISTRY_IMAGE}/video-web:latest|${SWR_IMAGE}/video-web:latest|g" k8s/web-deployment.yaml
 
           # Copy k8s manifests to server
-          scp -o StrictHostKeyChecking=no k8s/backend-deployment.yaml k8s/web-deployment.yaml k8s/ingress.yaml k8s/redis-deployment.yaml k8s/celery-deployment.yaml root@${{ secrets.K3S_HOST }}:/tmp/
+          scp -o StrictHostKeyChecking=no k8s/backend-deployment.yaml k8s/web-deployment.yaml k8s/ingress.yaml k8s/celery-deployment.yaml root@${{ secrets.K3S_HOST }}:/tmp/
 
           # Create/update secrets and apply manifests on server
           set -o pipefail
@@ -84,7 +84,6 @@ jobs:
               --from-literal=ALIYUN_SMS_ACCESS_SECRET='${{ secrets.ALIYUN_SMS_ACCESS_SECRET }}' \
               --dry-run=client -o yaml | kubectl apply -f -
 
-            kubectl apply -f /tmp/redis-deployment.yaml
             kubectl apply -f /tmp/backend-deployment.yaml
             kubectl apply -f /tmp/celery-deployment.yaml
             kubectl apply -f /tmp/web-deployment.yaml
@@ -97,7 +96,7 @@ jobs:
             kubectl rollout restart deployment/celery-worker
             kubectl rollout restart deployment/video-web
 
-            rm -f /tmp/backend-deployment.yaml /tmp/web-deployment.yaml /tmp/ingress.yaml /tmp/redis-deployment.yaml /tmp/celery-deployment.yaml
+            rm -f /tmp/backend-deployment.yaml /tmp/web-deployment.yaml /tmp/ingress.yaml /tmp/celery-deployment.yaml
           ENDSSH
 
       # ===== Log Center: failure reporting =====
diff --git a/backend/config/settings.py b/backend/config/settings.py
index 4a72c89..4ec1db3 100644
--- a/backend/config/settings.py
+++ b/backend/config/settings.py
@@ -173,7 +173,7 @@ CSRF_TRUSTED_ORIGINS = [o for o in CORS_ALLOWED_ORIGINS if o.startswith('https:/
 # ──────────────────────────────────────────────
 # Celery (async task queue)
 # ──────────────────────────────────────────────
-CELERY_BROKER_URL = os.environ.get('REDIS_URL', 'redis://localhost:6379/0')
+CELERY_BROKER_URL = os.environ.get('REDIS_URL', 'redis://:vAhRnAA6VMco@r-7xvat0vez5clwbzk5vpd.redis.rds.aliyuncs.com:6379/8')
 CELERY_RESULT_BACKEND = CELERY_BROKER_URL
 CELERY_ACCEPT_CONTENT = ['json']
 CELERY_TASK_SERIALIZER = 'json'
diff --git a/k8s/backend-deployment.yaml b/k8s/backend-deployment.yaml
index c1da0d1..2644741 100644
--- a/k8s/backend-deployment.yaml
+++ b/k8s/backend-deployment.yaml
@@ -56,7 +56,7 @@ spec:
           value: "3306"
         # Redis (Celery broker)
         - name: REDIS_URL
-          value: "redis://redis-service:6379/0"
+          value: "redis://:vAhRnAA6VMco@r-7xvat0vez5clwbzk5vpd.redis.rds.aliyuncs.com:6379/8"
         # CORS
         - name: CORS_ALLOWED_ORIGINS
           value: "https://airflow-studio.airlabs.art"
diff --git a/k8s/celery-deployment.yaml b/k8s/celery-deployment.yaml
index b1fff21..49b6f0f 100644
--- a/k8s/celery-deployment.yaml
+++ b/k8s/celery-deployment.yaml
@@ -35,7 +35,7 @@ spec:
               key: DJANGO_SECRET_KEY
         # Redis
         - name: REDIS_URL
-          value: "redis://redis-service:6379/0"
+          value: "redis://:vAhRnAA6VMco@r-7xvat0vez5clwbzk5vpd.redis.rds.aliyuncs.com:6379/8"
         # Database (Aliyun RDS)
         - name: DB_HOST
           valueFrom:
diff --git a/k8s/redis-deployment.yaml b/k8s/redis-deployment.yaml
deleted file mode 100644
index b603285..0000000
--- a/k8s/redis-deployment.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: redis
-  labels:
-    app: redis
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: redis
-  template:
-    metadata:
-      labels:
-        app: redis
-    spec:
-      containers:
-      - name: redis
-        image: redis:7-alpine
-        ports:
-        - containerPort: 6379
-        resources:
-          requests:
-            memory: "64Mi"
-            cpu: "50m"
-          limits:
-            memory: "128Mi"
-            cpu: "100m"
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: redis-service
-spec:
-  selector:
-    app: redis
-  ports:
-    - protocol: TCP
-      port: 6379
-      targetPort: 6379