From a69a08d31836287cced9dad8c31d6c2f2d97ae65 Mon Sep 17 00:00:00 2001
From: Charly Molter <charly.molter@konghq.com>
Date: Wed, 8 Feb 2023 09:42:25 +0100
Subject: [PATCH] ci(k3d): update k3d to latest and remove runc install in
 circleci

A long time has passed and the reason for this was: https://github.com/k3d-io/k3d/issues/807

We should be able to use the builtin runc instead

Signed-off-by: Charly Molter <charly.molter@konghq.com>
---
 .circleci/config.yml      | 8 --------
 mk/dependencies/deps.lock | 2 +-
 mk/dependencies/k3d.sh    | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3ff3e5168b18..a15c154f537c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -54,14 +54,6 @@ commands:
           # if GOPATH is not set, `golang-ci` fails with an obscure message
           # "ERRO Running error: context loading failed: failed to load program with go/packages: could not determine GOARCH and Go compiler"
           echo 'export GOPATH=$HOME/go' >> $BASH_ENV
-    - run:
-        name: "Update runc"
-        # See https://github.com/rancher/k3d/issues/807 (runc's default version on the instance fails k3d)
-        command: |
-          if [[ `uname -s` == "Linux" ]]; then
-            sudo sh -c 'curl -s --fail --location https://github.com/opencontainers/runc/releases/download/v1.1.0/runc.<<parameters.go_arch>> > /usr/bin/runc'
-            sudo chown root:root /usr/bin/runc ; sudo chmod o+x /usr/bin/runc
-          fi
   skip_on_branch:
     description: "Skip the job on the branch"
     steps:
diff --git a/mk/dependencies/deps.lock b/mk/dependencies/deps.lock
index f566c113f3dd..f565146c88fc 100644
--- a/mk/dependencies/deps.lock
+++ b/mk/dependencies/deps.lock
@@ -1 +1 @@
-e96ce3bb7caa3ae15cd5f5d75feb25e8bc562ead
+db2d98b7beb0286eef1edb7b371ce0c635b01211
diff --git a/mk/dependencies/k3d.sh b/mk/dependencies/k3d.sh
index eb8c0d0568fb..f765f8ff1d4b 100755
--- a/mk/dependencies/k3d.sh
+++ b/mk/dependencies/k3d.sh
@@ -3,7 +3,7 @@
 set -e
 
 OUTPUT_DIR=$1/bin
-VERSION="5.4.1"
+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