From fe7179f6e983e02a21c1a786caa9411c4674509c Mon Sep 17 00:00:00 2001
From: masoodafar-web <masoud.afarin.moghaddam@outlook.com>
Date: Thu, 24 Sep 2026 21:26:15 +0330
Subject: [PATCH] chore(k8s): deploy staging apps to namespace kbs-stage

Co-authored-by: Cursor <cursoragent@cursor.com>
---
 .gitea/workflows/kub-deploy.yml |  8 ++++----
 k8s/staging/cms-config.yaml     |  4 ++--
 k8s/staging/cms-deployment.yaml | 15 ++++++++++-----
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.gitea/workflows/kub-deploy.yml b/.gitea/workflows/kub-deploy.yml
index 5b4f047..a193043 100644
--- a/.gitea/workflows/kub-deploy.yml
+++ b/.gitea/workflows/kub-deploy.yml
@@ -93,11 +93,11 @@ jobs:
           
           # Apply config (Secret) first, then deployment
           sshpass -e ssh -o StrictHostKeyChecking=no root@${{ env.K8S_SERVER }} "
-            kubectl apply -f /tmp/cms-config.yaml &&
-            kubectl apply -f /tmp/cms-deployment.yaml &&
+            kubectl apply -n kbs-stage -f /tmp/cms-config.yaml &&
+            kubectl apply -n kbs-stage -f /tmp/cms-deployment.yaml &&
             crictl rmi ${REGISTRY}/${IMAGE_NAME}:latest 2>/dev/null || true &&
-            kubectl rollout restart deployment/cms &&
-            kubectl rollout status deployment/cms --timeout=180s &&
+            kubectl -n kbs-stage rollout restart deployment/cms &&
+            kubectl -n kbs-stage rollout status deployment/cms --timeout=180s &&
             rm -f /tmp/cms-config.yaml /tmp/cms-deployment.yaml
           "
           echo "✅ Deployed!"
diff --git a/k8s/staging/cms-config.yaml b/k8s/staging/cms-config.yaml
index 8ed3bfd..9dbe3f8 100644
--- a/k8s/staging/cms-config.yaml
+++ b/k8s/staging/cms-config.yaml
@@ -11,7 +11,7 @@ apiVersion: v1
 kind: Secret
 metadata:
   name: cms-appsettings
-  namespace: default
+  namespace: kbs-stage
   labels:
     app: cms
     environment: staging
@@ -53,7 +53,7 @@ stringData:
       "JwtAudience": "https://localhost",
       "JwtExpiryInDays": 5,
       "ConnectionStrings": {
-        "DefaultConnection": "Data Source=185.252.31.44,31433; Initial Catalog=Foursat;User ID=sa;Password=87zH26nbqT;Connection Timeout=300000;MultipleActiveResultSets=True;Encrypt=False",
+        "DefaultConnection": "Data Source=mssql-svc.platform.svc.cluster.local,1433; Initial Catalog=Foursat;User ID=sa;Password=87zH26nbqT;Connection Timeout=300000;MultipleActiveResultSets=True;Encrypt=False",
         "providerName": "System.Data.SqlClient"
       },
       "Otp": {
diff --git a/k8s/staging/cms-deployment.yaml b/k8s/staging/cms-deployment.yaml
index 54a8ad0..a5243c6 100644
--- a/k8s/staging/cms-deployment.yaml
+++ b/k8s/staging/cms-deployment.yaml
@@ -4,12 +4,14 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: cms-uploads-pvc
-  namespace: default
+  namespace: kbs-stage
   labels:
     app: cms
 spec:
   accessModes:
     - ReadWriteOnce
+  storageClassName: migrated-local
+  volumeName: pv-cms-uploads-migrated
   resources:
     requests:
       storage: 20Gi
@@ -20,7 +22,7 @@ apiVersion: apps/v1
 kind: Deployment
 metadata:
   name: cms
-  namespace: default
+  namespace: kbs-stage
   labels:
     app: cms
 spec:
@@ -33,10 +35,12 @@ spec:
       labels:
         app: cms
     spec:
+      imagePullSecrets:
+      - name: gitea-registry-secret
       containers:
       - name: cms
         image: 185.252.31.44:30080/admin/cms:latest
-        imagePullPolicy: Always
+        imagePullPolicy: IfNotPresent
         ports:
         - containerPort: 8080
           name: http
@@ -89,7 +93,7 @@ apiVersion: v1
 kind: Service
 metadata:
   name: cms-svc
-  namespace: default
+  namespace: kbs-stage
 spec:
   selector:
     app: cms
@@ -107,7 +111,7 @@ apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: cms-ingress
-  namespace: default
+  namespace: kbs-stage
   annotations:
     kubernetes.io/ingress.class: "nginx"
     cert-manager.io/cluster-issuer: "letsencrypt-prod"
@@ -115,6 +119,7 @@ metadata:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "3600"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "3600"
 spec:
+  ingressClassName: nginx
   tls:
   - hosts:
     - cms.se.kbs1.ir