Merge branch 'apiserver' into merge

.github/workflows/apiserver-test.yaml

@@ -5,11 +5,13 @@ on:
     branches:
       - master
       - release-*
+      - apiserver
   workflow_dispatch: {}
   pull_request:
     branches:
       - master
       - release-*
+      - apiserver
 
 env:
   # Common versions
@@ -60,6 +62,15 @@ jobs:
           version: ${{ env.KIND_VERSION }}
           skipClusterCreation: true
 
+      - name: Setup Kind Cluster (Worker)
+        run: |
+          kind delete cluster --name worker
+          kind create cluster --image kindest/node:v1.18.15@sha256:5c1b980c4d0e0e8e7eb9f36f7df525d079a96169c8a8f20d8bd108c0d0889cc4 --name worker
+          kubectl version
+          kubectl cluster-info
+          kind get kubeconfig --name worker --internal > /tmp/worker.kubeconfig
+          kind get kubeconfig --name worker > /tmp/worker.client.kubeconfig
+
       - name: Setup Kind Cluster (Hub)
         run: |
           kind delete cluster
@@ -67,7 +78,7 @@ jobs:
           kubectl version
           kubectl cluster-info
 
-      - name: Load Image to kind cluster (Hub)
+      - name: Load Image to kind cluster
         run: make kind-load
 
       - name: Cleanup for e2e tests
@@ -75,11 +86,22 @@ jobs:
           make e2e-cleanup
           make e2e-setup-core
 
+          make vela-cli
+          bin/vela addon enable fluxcd
+          timeout 600s bash -c -- 'while true; do kubectl get ns flux-system; if [ $? -eq 0 ] ; then break; else sleep 5; fi;done'
+          kubectl wait --for=condition=Ready pod -l app.kubernetes.io/name=vela-core,app.kubernetes.io/instance=kubevela -n vela-system --timeout=600s
+          kubectl wait --for=condition=Ready pod -l app=source-controller -n flux-system --timeout=600s
+          kubectl wait --for=condition=Ready pod -l app=helm-controller -n flux-system --timeout=600s
+
       - name: Run apiserver unit test
         run: make unit-test-apiserver
 
       - name: Run apiserver e2e test
-        run: make e2e-apiserver-test
+        run: |
+          export ALIYUN_ACCESS_KEY_ID=${{ secrets.ALIYUN_ACCESS_KEY_ID }}
+          export ALIYUN_ACCESS_KEY_SECRET=${{ secrets.ALIYUN_ACCESS_KEY_SECRET }}
+          export GITHUB_TOKEN=${{ secrets.GITHUB_TOKEN }}
+          make e2e-apiserver-test
 
       - name: Stop kubevela, get profile
         run: make end-e2e-core