From ef106fdef3696c4093e87f01808f4c71d804c901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyrill=20N=C3=A4f?= <cyrill.naef@gmail.com>
Date: Tue, 19 Nov 2024 10:39:56 +0000
Subject: [PATCH] Fix pipeline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Cyrill Näf <cyrill.naef@gmail.com>
---
 .github/workflows/ci.yaml          | 4 ++--
 Makefile                           | 2 +-
 cluster/local/integration_tests.sh | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 3eafa944..d42cf0b7 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -11,7 +11,7 @@ on:
 env:
   # Common versions
   GO_VERSION: '1.22.4'
-  GOLANGCI_VERSION: 'v1.56.1'
+  GOLANGCI_VERSION: 'v1.61.0'
   DOCKER_BUILDX_VERSION: 'v0.10.0'
 
   # Common users. We can't run a step 'if secrets.AWS_USR != ""' but we can run
@@ -295,7 +295,7 @@ jobs:
           BUILD_ARGS: "--load"
 
       - name: Run E2E Tests
-        run: make e2e USE_HELM3=true
+        run: make e2e USE_HELM3=true USE_HELM=true
 
   publish-artifacts:
     runs-on: ubuntu-22.04
diff --git a/Makefile b/Makefile
index 35d827af..d408238f 100644
--- a/Makefile
+++ b/Makefile
@@ -97,7 +97,7 @@ manifests:
 e2e.run: test-integration
 
 # Run integration tests.
-test-integration: $(KIND) $(KUBECTL) $(UP) $(HELM3)
+test-integration: $(KIND) $(KUBECTL) $(UP) $(HELM)
 	@$(INFO) running integration tests using kind $(KIND_VERSION)
 	@KIND_NODE_IMAGE_TAG=${KIND_NODE_IMAGE_TAG} $(ROOT_DIR)/cluster/local/integration_tests.sh || $(FAIL)
 	@$(OK) integration tests passed
diff --git a/cluster/local/integration_tests.sh b/cluster/local/integration_tests.sh
index 85ede6e6..ee73913c 100755
--- a/cluster/local/integration_tests.sh
+++ b/cluster/local/integration_tests.sh
@@ -131,13 +131,13 @@ echo "${PVC_YAML}" | "${KUBECTL}" create -f -
 
 # install crossplane from stable channel
 echo_step "installing crossplane from stable channel"
-"${HELM3}" repo add crossplane-stable https://charts.crossplane.io/stable/
-chart_version="$("${HELM3}" search repo crossplane-stable/crossplane | awk 'FNR == 2 {print $2}')"
+"${HELM}" repo add crossplane-stable https://charts.crossplane.io/stable/
+chart_version="$("${HELM}" search repo crossplane-stable/crossplane | awk 'FNR == 2 {print $2}')"
 echo_info "using crossplane version ${chart_version}"
 echo
 # we replace empty dir with our PVC so that the /cache dir in the kind node
 # container is exposed to the crossplane pod
-"${HELM3}" install crossplane --namespace crossplane-system crossplane-stable/crossplane --version "${chart_version}" --wait --set packageCache.pvc=package-cache
+"${HELM}" install crossplane --namespace crossplane-system crossplane-stable/crossplane --version "${chart_version}" --wait --set packageCache.pvc=package-cache
 
 # ----------- integration tests
 echo_step "--- INTEGRATION TESTS ---"