From 8087ae153393d6f06801f7a4f00003593cfe1a20 Mon Sep 17 00:00:00 2001
From: Charly Molter <charly.molter@konghq.com>
Date: Wed, 22 Feb 2023 11:59:18 +0100
Subject: [PATCH] ci(k3d): update k3d to latest and remove runc install in
 circleci (#5950)

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>
Signed-off-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.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 836cb738b234..6f26b8293f63 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
           # "ERROR 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 9868a6d1dc5a..81f04d4e27cf 100644
--- a/mk/dependencies/deps.lock
+++ b/mk/dependencies/deps.lock
@@ -1 +1 @@
-67889e3238f7864379bda2d4e78945266d6573cb
+c54f65abdaf804857dec02b42815967306546580
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