From 0b5e86d42f9846871d2f5b13a56cb5e4c7b3ab37 Mon Sep 17 00:00:00 2001
From: Lukasz Dziedziak <lukidzi@gmail.com>
Date: Mon, 16 Dec 2024 15:56:12 +0100
Subject: [PATCH] resolve

Signed-off-by: Lukasz Dziedziak <lukidzi@gmail.com>
---
 .github/workflows/_e2e.yaml | 10 ----------
 mk/k3d.mk                   |  7 +------
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/.github/workflows/_e2e.yaml b/.github/workflows/_e2e.yaml
index 81ff431adce2..03721ca6efab 100644
--- a/.github/workflows/_e2e.yaml
+++ b/.github/workflows/_e2e.yaml
@@ -6,12 +6,7 @@ on:
         type: string
       runner:
         type: string
-<<<<<<< HEAD
-        required: false
-        default: '{"amd64": "ubuntu-latest", "arm64": "ubuntu-latest-arm64-kong"}'
-=======
         required: true
->>>>>>> 126029d11 (ci(.github): enable self hosted runners for AMD64 E2E tasks (#10945))
 permissions:
   contents: read
 env:
@@ -25,14 +20,9 @@ env:
 jobs:
   e2e:
     timeout-minutes: 60
-<<<<<<< HEAD
-    # use the runner from the map, if the runner is circleci or '' then use ubuntu-latest
-    runs-on: ${{ contains(fromJSON('["circleci", ""]'), fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch]) && 'ubuntu-latest' || fromJSON(inputs.runnersByArch)[fromJSON(inputs.matrix).arch]}}
-=======
     # can't use env vars here
     runs-on: ${{ inputs.runner }}
     if: ${{ inputs.runner != '' }}
->>>>>>> 126029d11 (ci(.github): enable self hosted runners for AMD64 E2E tasks (#10945))
     strategy:
       fail-fast: false
       matrix:
diff --git a/mk/k3d.mk b/mk/k3d.mk
index 795e59bd7500..128e73b6adac 100644
--- a/mk/k3d.mk
+++ b/mk/k3d.mk
@@ -84,17 +84,12 @@ k3d/network/create:
 		else docker network create -d=bridge $(KIND_NETWORK_OPTS) kind || true; fi && \
 		rm -f $(BUILD_DIR)/k3d_network.lock
 
-<<<<<<< HEAD
 $(TOP)/$(KUMA_DIR)/test/k3d/calico.$(K3D_VERSION).yaml:
 	@mkdir -p $(TOP)/$(KUMA_DIR)/test/k3d
 	curl --location --fail --silent --retry 5 \
 		-o $(TOP)/$(KUMA_DIR)/test/k3d/calico.$(K3D_VERSION).yaml \
 		https://k3d.io/v$(K3D_VERSION)/usage/advanced/calico.yaml
 
-.PHONY: k3d/start
-k3d/start: ${KIND_KUBECONFIG_DIR} k3d/network/create \
-	$(if $(findstring calico,$(K3D_NETWORK_CNI)),$(TOP)/$(KUMA_DIR)/test/k3d/calico.$(K3D_VERSION).yaml)
-=======
 DOCKERHUB_PULL_CREDENTIAL ?=
 .PHONY: k3d/setup-docker-credentials
 k3d/setup-docker-credentials:
@@ -112,7 +107,7 @@ k3d/cleanup-docker-credentials:
 
 .PHONY: k3d/start
 k3d/start: ${KIND_KUBECONFIG_DIR} k3d/network/create k3d/setup-docker-credentials
->>>>>>> 126029d11 (ci(.github): enable self hosted runners for AMD64 E2E tasks (#10945))
+	$(if $(findstring calico,$(K3D_NETWORK_CNI)),$(TOP)/$(KUMA_DIR)/test/k3d/calico.$(K3D_VERSION).yaml)
 	@echo "PORT_PREFIX=$(PORT_PREFIX)"
 	@KUBECONFIG=$(KIND_KUBECONFIG) \
 		$(K3D_BIN) cluster create "$(KIND_CLUSTER_NAME)" $(K3D_CLUSTER_CREATE_OPTS)