From a7de7453fc707ffcfad43f89a6708b0f9811ad39 Mon Sep 17 00:00:00 2001
From: Abhijith Ravindra <137736216+abhijith-darshan@users.noreply.github.com>
Date: Fri, 8 Nov 2024 13:43:22 +0100
Subject: [PATCH] Apply suggestions from code review

Co-authored-by: David Gogl <1381862+kengou@users.noreply.github.com>
---
 .github/workflows/ci-e2e-test.yaml |  2 --
 Makefile                           | 16 ++++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci-e2e-test.yaml b/.github/workflows/ci-e2e-test.yaml
index b204a60d..71dbbfd1 100644
--- a/.github/workflows/ci-e2e-test.yaml
+++ b/.github/workflows/ci-e2e-test.yaml
@@ -57,14 +57,12 @@ jobs:
       - name: Create Admin Cluster
         uses: helm/kind-action@v1.10.0
         with:
-          version: 'v0.24.0'
           cluster_name: ${{ env.ADMIN_CLUSTER }}
 
       # Create the remote cluster with kubernetes version from the matrix
       - name: Create Remote Cluster
         uses: helm/kind-action@v1.10.0
         with:
-          version: 'v0.24.0'
           node_image: 'kindest/node:${{ matrix.k8s-version }}'
           cluster_name: ${{ env.REMOTE_CLUSTER }}
           config: ${{ github.workspace }}/e2e/kind-config.yaml
diff --git a/Makefile b/Makefile
index 3b23b764..8ce3ba40 100644
--- a/Makefile
+++ b/Makefile
@@ -257,23 +257,23 @@ e2e:
 
 .PHONY: e2e-local
 e2e-local: prepare-e2e
-	GREENHOUSE_ADMIN_KUBECONFIG="${PWD}/bin/$(ADMIN_CLUSTER).kubeconfig" \
-    	GREENHOUSE_REMOTE_KUBECONFIG="${PWD}/bin/$(REMOTE_CLUSTER).kubeconfig" \
-    	GREENHOUSE_REMOTE_INT_KUBECONFIG="${PWD}/bin/$(REMOTE_CLUSTER)-int.kubeconfig" \
-    	CONTROLLER_LOGS_PATH="${PWD}/bin/$(SCENARIO)-e2e-pod-logs.txt" \
+	GREENHOUSE_ADMIN_KUBECONFIG="$(shell pwd)/bin/$(ADMIN_CLUSTER).kubeconfig" \
+    	GREENHOUSE_REMOTE_KUBECONFIG="$(shell pwd)/bin/$(REMOTE_CLUSTER).kubeconfig" \
+    	GREENHOUSE_REMOTE_INT_KUBECONFIG="$(shell pwd)/bin/$(REMOTE_CLUSTER)-int.kubeconfig" \
+    	CONTROLLER_LOGS_PATH="$(shell pwd)/bin/$(SCENARIO)-e2e-pod-logs.txt" \
     	EXECUTION_ENV=$(EXECUTION_ENV) \
 		GOMEGA_DEFAULT_EVENTUALLY_TIMEOUT="2m" \
-		go test -tags="$(SCENARIO)E2E" ${PWD}/e2e/$(SCENARIO) -test.v -ginkgo.v --ginkgo.junit-report=${PWD}/bin/$(SCENARIO)-e2e-report.xml
+		go test -tags="$(SCENARIO)E2E" $(shell pwd)/e2e/$(SCENARIO) -test.v -ginkgo.v --ginkgo.junit-report=$(shell pwd)/bin/$(SCENARIO)-e2e-report.xml
 
 .PHONY: prepare-e2e
 prepare-e2e:
-	kind get kubeconfig --name $(ADMIN_CLUSTER) > ${PWD}/bin/$(ADMIN_CLUSTER).kubeconfig
-	kind get kubeconfig --name $(REMOTE_CLUSTER) > ${PWD}/bin/$(REMOTE_CLUSTER).kubeconfig
+	kind get kubeconfig --name $(ADMIN_CLUSTER) > $(shell pwd)/bin/$(ADMIN_CLUSTER).kubeconfig
+	kind get kubeconfig --name $(REMOTE_CLUSTER) > $(shell pwd)/bin/$(REMOTE_CLUSTER).kubeconfig
 	kind get kubeconfig --name $(REMOTE_CLUSTER) --internal > ${PWD}/bin/$(REMOTE_CLUSTER)-int.kubeconfig
 
 .PHONY: list-scenarios
 list-scenarios:
-	find ${PWD}/e2e -type f -name 'e2e_test.go' -exec dirname {} \; | xargs -n 1 basename | jq -R -s -c 'split("\n")[:-1]'
+	find $(shell pwd)/e2e -type f -name 'e2e_test.go' -exec dirname {} \; | xargs -n 1 basename | jq -R -s -c 'split("\n")[:-1]'
 
 .PHONY: dev-docs
 dev-docs: