From ac436367aaf5915418f9545f8a53b3ded86fbce6 Mon Sep 17 00:00:00 2001
From: Jake <jake@weave.works>
Date: Tue, 8 Feb 2022 10:46:35 +0000
Subject: [PATCH] fix deploy workflow

---
 .github/actions/run-acceptance-test/action.yml |  2 +-
 .github/workflows/deploy.yml                   | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/actions/run-acceptance-test/action.yml b/.github/actions/run-acceptance-test/action.yml
index 09f996a1d8..75c2246ebf 100644
--- a/.github/actions/run-acceptance-test/action.yml
+++ b/.github/actions/run-acceptance-test/action.yml
@@ -53,7 +53,7 @@ runs:
       sudo mv -f chromedriver /usr/local/bin/chromedriver
        wget  https://selenium-release.storage.googleapis.com/3.14/selenium-server-standalone-3.14.0.jar
        xvfb-run -a --server-args="-screen 0 1280x1024x24" java -jar ./selenium-server-standalone-3.14.0.jar &
-  - name: Setup Kubernetes Tools
+  - name: Setup Kubernetes
     shell: bash
     env:
       KIND_CLUSTER_NAME: ${{ format('katc-{0}', github.run_id) }}
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 608bc1183d..36bf2236c0 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -117,12 +117,12 @@ jobs:
 
         xvfb-run -a --server-args="-screen 0 1280x1024x24" java -jar ./selenium-server-standalone-3.14.0.jar &
     - name: Setup Kubernetes
-      uses: engineerd/setup-kind@v0.5.0
-      with:
-        name: "${{ format('katc-{0}', github.run_id) }}"
-        version: "v0.11.0"
-        image: kindest/node:v1.20.7
-        config: "./test/acceptance/test/configs/kind-config.yaml"
+      shell: bash
+      env:
+        KIND_CLUSTER_NAME: ${{ format('katc-{0}', github.run_id) }}
+        KIND_CLUSTER_IMAGE: kindest/node:v1.21.1
+      run: |
+        make local-kind-cluster-with-registry
     - name: Kind-check
       run: |
        kubectl get pods -A
@@ -155,7 +155,7 @@ jobs:
         export WEGO_BIN_PATH=$(pwd)/bin/gitops
         go get github.com/onsi/ginkgo/ginkgo
         go get github.com/onsi/gomega
-        ginkgo --randomizeSuites --reportFile=${{ env. ARTIFACTS_BASE_DIR }}/test-results/acceptance-test-results.xml -v ./test/acceptance/test/...
+        ACCEPTANCE_TEST_ARGS="--randomizeSuites --reportFile=${{ env. ARTIFACTS_BASE_DIR }}/test-results/acceptance-test-results.xml" make acceptance-tests
     - name: Store acceptance-tests results
       uses: actions/upload-artifact@v2
       with: