chore(deps): resolve conflicts

Signed-off-by: slonka <[email protected]>

.gitignore

@@ -20,11 +20,6 @@ build/
 # to embed ebpf programs by using go:embed, we have to copy programs first
 pkg/transparentproxy/ebpf/programs/amd64/mb_*
 pkg/transparentproxy/ebpf/programs/arm64/mb_*
-<<<<<<< HEAD
-=======
-
-/justfile
 
 # Used to download manifests for k3d
 /test/k3d
->>>>>>> 529694bad (ci(k8s): download calico manifests as needed (#11851))

mk/dependencies/deps.lock

@@ -1,5 +1 @@
-<<<<<<< HEAD
-8833e8be9eeeee4903952db5e738daf19645c938
-=======
-b1205d74c2e9db303adc2d29d38c6edb8ae52081
->>>>>>> 529694bad (ci(k8s): download calico manifests as needed (#11851))
+b7ed391a41482e10d356d722a0d99e1dd4537b95

mk/dependencies/k3d.sh

@@ -1,15 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 set -e
 
 OUTPUT_DIR=$1/bin
-<<<<<<< HEAD
 VERSION="5.4.7"
-# see https://raw.githubusercontent.com/rancher/k3d/main/install.sh
-curl --fail --location -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | \
-          PATH=${OUTPUT_DIR}:${PATH} TAG=v${VERSION} USE_SUDO="false" K3D_INSTALL_DIR="${OUTPUT_DIR}" bash
-=======
-VERSION="5.7.4"
 
 if [[ $2 == "get-version" ]]; then
   echo ${VERSION}
@@ -18,4 +12,3 @@ else
   curl --fail --location -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | \
             PATH=${OUTPUT_DIR}:${PATH} TAG=v${VERSION} USE_SUDO="false" K3D_INSTALL_DIR="${OUTPUT_DIR}" bash
 fi
->>>>>>> 529694bad (ci(k8s): download calico manifests as needed (#11851))

mk/k3d.mk

@@ -52,13 +52,8 @@ K3D_CLUSTER_CREATE_OPTS ?= -i rancher/k3s:$(CI_K3S_VERSION) \
 	--timeout 120s
 
 ifeq ($(K3D_NETWORK_CNI),calico)
-<<<<<<< HEAD
-	K3D_CLUSTER_CREATE_OPTS += --volume "$(TOP)/test/k3d/calico.yaml.kubelint-excluded:/var/lib/rancher/k3s/server/manifests/calico.yaml" \
-		--k3s-arg '--flannel-backend=none@server:*'
-=======
 	K3D_CLUSTER_CREATE_OPTS += --volume "$(TOP)/$(KUMA_DIR)/test/k3d/calico.$(K3D_VERSION).yaml:/var/lib/rancher/k3s/server/manifests/calico.yaml" \
-		--k3s-arg '--flannel-backend=none@server:*' --k3s-arg '--disable-network-policy@server:*'
->>>>>>> 529694bad (ci(k8s): download calico manifests as needed (#11851))
+		--k3s-arg '--flannel-backend=none@server:*'
 endif
 
 ifdef CI
@@ -87,36 +82,15 @@ k3d/network/create:
 		else docker network create -d=bridge $(KIND_NETWORK_OPTS) kind || true; fi && \
 		rm -f $(BUILD_DIR)/k3d_network.lock
 
-<<<<<<< HEAD
-.PHONY: k3d/start
-k3d/start: ${KIND_KUBECONFIG_DIR} k3d/network/create
-=======
-DOCKERHUB_PULL_CREDENTIAL ?=
-.PHONY: k3d/setup-docker-credentials
-k3d/setup-docker-credentials:
-	@mkdir -p /tmp/.kuma-dev ; \
-	echo '{"configs": {}}' > /tmp/.kuma-dev/k3d-registry.yaml ; \
-	if [[ "$(DOCKERHUB_PULL_CREDENTIAL)" != "" ]]; then \
-  		DOCKER_USER=$$(echo "$(DOCKERHUB_PULL_CREDENTIAL)" | cut -d ':' -f 1); \
-  		DOCKER_PWD=$$(echo "$(DOCKERHUB_PULL_CREDENTIAL)" | cut -d ':' -f 2); \
-  		echo "{\"configs\": {\"registry-1.docker.io\": {\"auth\": {\"username\": \"$${DOCKER_USER}\",\"password\":\"$${DOCKER_PWD}\"}}}}" > /tmp/.kuma-dev/k3d-registry.yaml ; \
-  	fi
-
-.PHONY: k3d/cleanup-docker-credentials
-k3d/cleanup-docker-credentials:
-	@rm -f /tmp/.kuma-dev/k3d-registry.yaml
-
 $(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 k3d/setup-docker-credentials \
+k3d/start: ${KIND_KUBECONFIG_DIR} k3d/network/create \
 	$(if $(findstring calico,$(K3D_NETWORK_CNI)),$(TOP)/$(KUMA_DIR)/test/k3d/calico.$(K3D_VERSION).yaml)
-
->>>>>>> 529694bad (ci(k8s): download calico manifests as needed (#11851))
 	@echo "PORT_PREFIX=$(PORT_PREFIX)"
 	@KUBECONFIG=$(KIND_KUBECONFIG) \
 		$(K3D_BIN) cluster create "$(KIND_CLUSTER_NAME)" $(K3D_CLUSTER_CREATE_OPTS)