update CI

Signed-off-by: Alexandre Lamarre <[email protected]>

.github/workflows/e2e.yaml

@@ -8,7 +8,7 @@ on:
 
 env:
   CLUSTER_NAME : test-cluster
-  K3S_VERSION : v1.27.9-k3s1
+  K3S_VERSION : v1.30.2-k3s1
 
 jobs:
   build:
@@ -27,17 +27,10 @@ jobs:
           sudo install -o root -g root -m 0755 kubectl /usr/local/bin/kubectl
       - name: Set up k3d
         run : ./.github/workflows/scripts/install-k3d.sh
-      - name: build
-        run: make build 
       - name : Setup cluster
         run :  CLUSTER_NAME=${{ env.CLUSTER_NAME }} K3S_VERSION=${{ env.K3S_VERSION }} ./scripts/setup-cluster.sh
-      # temporary hack to run the helm-locker controller in the k3d cluster
-      - name : run helm-locker
-        run : |
-          kubectl create ns cattle-helm-system
-          ./bin/helm-locker &
-      - name : run e2e tests
+      - name : make CI
         run: |
           k3d kubeconfig get ${{ env.CLUSTER_NAME }} > kubeconfig.yaml
           export KUBECONFIG=$(pwd)/kubeconfig.yaml
-          cd tests && KUBECONFIG=$KUBECONFIG go test -v -race -timeout 30m ./...
+          KUBECONFIG=$KUBECONFIG make ci 

scripts/build

@@ -1,6 +1,8 @@
 #!/bin/bash
 set -e
 
+echo "Building helm-locker"
+
 source $(dirname $0)/version
 
 cd $(dirname $0)/..

scripts/test

@@ -4,4 +4,4 @@ set -e
 cd $(dirname $0)/..
 
 echo Running tests
-go test -cover -tags=test ./...
+KUBECONFIG=$KUBECONFIG go test -race -cover -timeout 10m ./...

tests/e2e/e2e_test.go

@@ -58,7 +58,7 @@ var _ = Describe("E2E helm locker operator tests", Ordered, Label("integration")
 		Expect(crd.Create(testCtx, cfg)).To(Succeed())
 		go func() {
 			if err := controllers.Register(testCtx, ns, "helm-locker", "node1", clientCmdCfg); err != nil {
-				Fail(fmt.Sprintf("Failed to register controllers %s", err))
+				GinkgoWriter.Write([]byte(fmt.Sprintf("Failed to register controllers: %s", err)))
 			}
 		}()
 	})