From bb6ac2f529155132a5d64a5f4650b8c8526ef6bb Mon Sep 17 00:00:00 2001
From: CloudForge Dev <cloudforge.dev@gmail.com>
Date: Wed, 19 Nov 2025 16:50:10 +0800
Subject: [PATCH] Add kubectl installation 3

---
 .gitea/workflows/build-deploy.yml | 39 +++++++++++++++++--------------
 1 file changed, 21 insertions(+), 18 deletions(-)

diff --git a/.gitea/workflows/build-deploy.yml b/.gitea/workflows/build-deploy.yml
index 5f5946c..b374a64 100644
--- a/.gitea/workflows/build-deploy.yml
+++ b/.gitea/workflows/build-deploy.yml
@@ -10,23 +10,30 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
+    - name: Restore kubeconfig
+      run: |
+        mkdir -p ~/.kube
+        echo $KUBECONFIG_DATA | base64 -d > ~/.kube/config
+        chmod 600 ~/.kube/config
+      env:
+        KUBECONFIG_DATA: ${{ secrets.KUBECONFIG }}
+
     - name: Checkout
       uses: actions/checkout@v3
 
-    - name: Install kubectl + Build with Kaniko + Deploy
-      # 用 bitnami/kubectl image，呢個 image 入面有 curl, bash, kubectl
-      container:
-        image: bitnami/kubectl:latest
+    - name: Install kubectl
       run: |
-        # ---- 下載 kubectl 前先檢查已存在版本 ----
-        kubectl version --client
+        curl -LO "https://dl.k8s.io/release/v1.28.0/bin/linux/amd64/kubectl"
+        chmod +x kubectl
+        sudo mv kubectl /usr/local/bin/kubectl
 
-        # ---- Kaniko Job ----
-        kubectl apply -f - <<EOJOB
+    - name: Build & Deploy with Kaniko (all in one)
+      run: |
+        /usr/local/bin/kubectl apply -f - <<EOJOB
         apiVersion: batch/v1
         kind: Job
         metadata:
-          name: build-backend-\${GITHUB_SHA:0:8}
+          name: build-backend-${GITHUB_SHA:0:8}
           namespace: cloudforge
         spec:
           ttlSecondsAfterFinished: 600
@@ -38,7 +45,7 @@ jobs:
                 args:
                 - "--dockerfile=Dockerfile"
                 - "--context=git://gitea-http.gitea.svc.cluster.local:3000/cloudforge-dev/dashboard-backend.git#main"
-                - "--destination=cloudforge-dashboard-backend:\${GITHUB_SHA:0:8}"
+                - "--destination=cloudforge-dashboard-backend:${GITHUB_SHA:0:8}"
                 - "--destination=cloudforge-dashboard-backend:latest"
                 - "--insecure"
                 - "--skip-tls-verify"
@@ -46,14 +53,10 @@ jobs:
               restartPolicy: Never
         EOJOB
 
-        # ---- Wait Kaniko Build----
-        kubectl wait --for=condition=complete --timeout=600s job/build-backend-\${GITHUB_SHA:0:8} -n cloudforge
+        /usr/local/bin/kubectl wait --for=condition=complete --timeout=600s job/build-backend-${GITHUB_SHA:0:8} -n cloudforge
 
-        # ---- Deploy Backend ----
-        kubectl set image deployment/dashboard-backend backend=cloudforge-dashboard-backend:\${GITHUB_SHA:0:8} -n cloudforge --record
+        /usr/local/bin/kubectl set image deployment/dashboard-backend backend=cloudforge-dashboard-backend:${GITHUB_SHA:0:8} -n cloudforge --record
 
-        # ---- Verify Deployment ----
-        kubectl rollout status deployment/dashboard-backend -n cloudforge --timeout=300s
+        /usr/local/bin/kubectl rollout status deployment/dashboard-backend -n cloudforge --timeout=300s
 
-        # ---- Cleanup ----
-        kubectl delete job build-backend-\${GITHUB_SHA:0:8} -n cloudforge
+        /usr/local/bin/kubectl delete job build-backend-${GITHUB_SHA:0:8} -n cloudforge