refactor: 切换 Celery broker 为阿里云 Redis,移除自建 Redis Pod
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 2m28s
All checks were successful
Build and Deploy / build-and-deploy (push) Successful in 2m28s
复用现有阿里云 Tair 实例(db8),减少集群内 Pod 数量和运维负担。 Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
parent
60713ea009
commit
35ebb55893
@ -65,7 +65,7 @@ jobs:
|
|||||||
sed -i "s|\${CI_REGISTRY_IMAGE}/video-web:latest|${SWR_IMAGE}/video-web:latest|g" k8s/web-deployment.yaml
|
sed -i "s|\${CI_REGISTRY_IMAGE}/video-web:latest|${SWR_IMAGE}/video-web:latest|g" k8s/web-deployment.yaml
|
||||||
|
|
||||||
# Copy k8s manifests to server
|
# 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
|
# Create/update secrets and apply manifests on server
|
||||||
set -o pipefail
|
set -o pipefail
|
||||||
@ -84,7 +84,6 @@ jobs:
|
|||||||
--from-literal=ALIYUN_SMS_ACCESS_SECRET='${{ secrets.ALIYUN_SMS_ACCESS_SECRET }}' \
|
--from-literal=ALIYUN_SMS_ACCESS_SECRET='${{ secrets.ALIYUN_SMS_ACCESS_SECRET }}' \
|
||||||
--dry-run=client -o yaml | kubectl apply -f -
|
--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/backend-deployment.yaml
|
||||||
kubectl apply -f /tmp/celery-deployment.yaml
|
kubectl apply -f /tmp/celery-deployment.yaml
|
||||||
kubectl apply -f /tmp/web-deployment.yaml
|
kubectl apply -f /tmp/web-deployment.yaml
|
||||||
@ -97,7 +96,7 @@ jobs:
|
|||||||
kubectl rollout restart deployment/celery-worker
|
kubectl rollout restart deployment/celery-worker
|
||||||
kubectl rollout restart deployment/video-web
|
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
|
ENDSSH
|
||||||
|
|
||||||
# ===== Log Center: failure reporting =====
|
# ===== Log Center: failure reporting =====
|
||||||
|
|||||||
@ -173,7 +173,7 @@ CSRF_TRUSTED_ORIGINS = [o for o in CORS_ALLOWED_ORIGINS if o.startswith('https:/
|
|||||||
# ──────────────────────────────────────────────
|
# ──────────────────────────────────────────────
|
||||||
# Celery (async task queue)
|
# 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_RESULT_BACKEND = CELERY_BROKER_URL
|
||||||
CELERY_ACCEPT_CONTENT = ['json']
|
CELERY_ACCEPT_CONTENT = ['json']
|
||||||
CELERY_TASK_SERIALIZER = 'json'
|
CELERY_TASK_SERIALIZER = 'json'
|
||||||
|
|||||||
@ -56,7 +56,7 @@ spec:
|
|||||||
value: "3306"
|
value: "3306"
|
||||||
# Redis (Celery broker)
|
# Redis (Celery broker)
|
||||||
- name: REDIS_URL
|
- name: REDIS_URL
|
||||||
value: "redis://redis-service:6379/0"
|
value: "redis://:vAhRnAA6VMco@r-7xvat0vez5clwbzk5vpd.redis.rds.aliyuncs.com:6379/8"
|
||||||
# CORS
|
# CORS
|
||||||
- name: CORS_ALLOWED_ORIGINS
|
- name: CORS_ALLOWED_ORIGINS
|
||||||
value: "https://airflow-studio.airlabs.art"
|
value: "https://airflow-studio.airlabs.art"
|
||||||
|
|||||||
@ -35,7 +35,7 @@ spec:
|
|||||||
key: DJANGO_SECRET_KEY
|
key: DJANGO_SECRET_KEY
|
||||||
# Redis
|
# Redis
|
||||||
- name: REDIS_URL
|
- name: REDIS_URL
|
||||||
value: "redis://redis-service:6379/0"
|
value: "redis://:vAhRnAA6VMco@r-7xvat0vez5clwbzk5vpd.redis.rds.aliyuncs.com:6379/8"
|
||||||
# Database (Aliyun RDS)
|
# Database (Aliyun RDS)
|
||||||
- name: DB_HOST
|
- name: DB_HOST
|
||||||
valueFrom:
|
valueFrom:
|
||||||
|
|||||||
@ -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
|
|
||||||
Loading…
x
Reference in New Issue
Block a user