Fix errors

Signed-off-by: Ye Cao <[email protected]>

Author: dashanji

.github/workflows/vineyard-operator.yaml

@@ -123,15 +123,6 @@ jobs:
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Build a kind cluster with local registry
-        run: |
-          touch /tmp/e2e-k8s.config
-          export KUBECONFIG=/tmp/e2e-k8s.config
-          bash k8s/test/hack/build-kind-cluster-with-local-registry.sh
-          make -C k8s install-cert-manager
-          make -C k8s install-vineyard-operator
-          make -C k8s install-vineyard-cluster
-      
       - name: Build docker image
         run: |
           make -C k8s docker-build
@@ -158,67 +149,52 @@ jobs:
         run: |
           make -C docker build-python-dev
 
-      - name: Install e2e test dependencies
-        if: ${{ matrix.job != 'release' }}
-        run: |
-          sudo bash k8s/test/hack/prepare-e2e.sh
-
       - name: e2e-tests-assembly-local
         if: ${{ matrix.job == 'e2e-tests-assembly-local' }}
-        uses: apache/skywalking-infra-e2e@main
-        with:
-          e2e-file: k8s/test/e2e/assembly/local-assembly-e2e.yaml
+        run: |
+          make -C k8s e2e-tests-assembly-local
 
       - name: e2e-tests-assembly-distributed
         if: ${{ matrix.job == 'e2e-tests-assembly-distributed' }}
-        uses: apache/skywalking-infra-e2e@main
-        with:
-          e2e-file: k8s/test/e2e/assembly/distributed-assembly-e2e.yaml
+        run: |
+          make -C k8s e2e-tests-assembly-distributed
 
       - name: e2e-tests-autogenerated-helm-chart
         if: ${{ matrix.job == 'e2e-tests-autogenerated-helm-chart' }}
-        uses: apache/skywalking-infra-e2e@main
-        with:
-          e2e-file: k8s/test/e2e/autogenerated-helm-chart/e2e.yaml
+        run: |
+          make -C k8s e2e-tests-autogenerated-helm-chart
 
       - name: e2e-tests-failover
         if: ${{ matrix.job == 'e2e-tests-failover' }}
-        uses: apache/skywalking-infra-e2e@main
-        with:
-          e2e-file: k8s/test/e2e/failover/e2e.yaml
+        run: |
+          make -C k8s e2e-tests-failover
 
       - name: e2e-tests-repartition-dask
         if: ${{ matrix.job == 'e2e-tests-repartition-dask' }}
-        uses: apache/skywalking-infra-e2e@main
-        with:
-          e2e-file: k8s/test/e2e/repartition/dask-repartition-e2e.yaml
+        run: |
+          make -C k8s e2e-tests-repartition-dask
 
       - name: e2e-tests-scheduler-outside-cluster
         if: ${{ matrix.job == 'e2e-tests-scheduler-outside-cluster' }}
-        uses: apache/skywalking-infra-e2e@main
-        with:
-          e2e-file: k8s/test/e2e/scheduling-outside-cluster/e2e.yaml
+        run: |
+          make -C k8s e2e-tests-scheduler-outside-cluster
 
       - name: e2e-tests-serialize
         if: ${{ matrix.job == 'e2e-tests-serialize' }}
-        uses: apache/skywalking-infra-e2e@main
-        with:
-          e2e-file: k8s/test/e2e/serialize/e2e.yaml
+        run: |
+          make -C k8s e2e-tests-serialize
 
       - name: e2e-tests-sidecar
         if: ${{ matrix.job == 'e2e-tests-sidecar' }}
-        uses: apache/skywalking-infra-e2e@main
-        with:
-          e2e-file: k8s/test/e2e/sidecar/e2e.yaml
+        run: |
+          make -C k8s e2e-tests-sidecar
 
       - name: e2e-tests-spill
-        if: false  ## FIXME(tao) ${{ matrix.job == 'e2e-tests-spill' }}
-        uses: apache/skywalking-infra-e2e@main
-        with:
-          e2e-file: k8s/test/e2e/spill/e2e.yaml
+        if: ${{ matrix.job == 'e2e-tests-spill' }}
+        run: |
+          make -C k8s e2e-tests-spill
 
       - name: e2e-tests-workflow
         if: ${{ matrix.job == 'e2e-tests-workflow' }}
-        uses: apache/skywalking-infra-e2e@main
-        with:
-          e2e-file: k8s/test/e2e/workflow/e2e.yaml
+        run: |
+          make -C k8s e2e-tests-workflow

k8s/Makefile

@@ -98,6 +98,8 @@ install-vineyard-cluster:
 	@kubectl wait vineyardd/vineyardd-sample --for condition=Available -n vineyard-system --timeout=300s --kubeconfig=/tmp/e2e-k8s.config
 	@echo "Vineyard cluster Ready"
 
+install-vineyard: build-local-cluster install-cert-manager install-vineyard-operator install-vineyard-cluster
+	sleep 6000
 e2e-tests-assembly-local: kustomize prepare-e2e-test build-local-cluster install-cert-manager install-vineyard-operator install-vineyard-cluster
 	@echo "Running local assembly e2e test..."
 	@cd .. && ${GOBIN}/e2e run --config=k8s/test/e2e/assembly/local-assembly-e2e.yaml

k8s/config/manager/kustomization.yaml

@@ -4,5 +4,5 @@ apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 images:
 - name: controller
-  newName: vineyardcloudnative/vineyard-operator
+  newName: localhost:5001/vineyard-operator
   newTag: latest

k8s/test/e2e/assembly/distributed-assembly-e2e.yaml

@@ -18,23 +18,6 @@ setup:
   env: kind
   kubeconfig: /tmp/e2e-k8s.config
   steps:
-    - name: install cert-manager
-      command: |
-        kubectl apply -f https://github.com/cert-manager/cert-manager/releases/download/v1.9.1/cert-manager.yaml
-      wait:
-        - namespace: cert-manager
-          resource: pod
-          for: condition=Ready
-    - name: install vineyard operator
-      command: |
-        docker tag vineyardcloudnative/vineyard-operator:latest localhost:5001/vineyard-operator:latest
-        docker push localhost:5001/vineyard-operator:latest
-        export IMG=localhost:5001/vineyard-operator:latest
-        make -C k8s deploy
-      wait:
-        - namespace: vineyard-system
-          resource: deployment/vineyard-controller-manager
-          for: condition=Available
     - name: download all distributed assembly images into kind cluster
       command: |
         make -C k8s/test/e2e e2e-test-distributed-assembly REGISTRY=localhost:5001