From fd77451bca8b348a6e2448a7273aa4203a66b2b4 Mon Sep 17 00:00:00 2001
From: David Gageot <david@gageot.net>
Date: Thu, 23 Jul 2020 16:29:06 +0200
Subject: [PATCH] Include k3d 3.0.0 in Skaffold image (#4545)

Signed-off-by: David Gageot <david@gageot.net>
---
 deploy/skaffold/Dockerfile      | 2 +-
 deploy/skaffold/Dockerfile.deps | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/deploy/skaffold/Dockerfile b/deploy/skaffold/Dockerfile
index 4c9de108a69..714acbb3703 100644
--- a/deploy/skaffold/Dockerfile
+++ b/deploy/skaffold/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # This base image has to be updated manually after running `make build_deps`
-FROM gcr.io/k8s-skaffold/build_deps:8061be2a8192708bf4c51bc4a5663fd6069184f2 as builder
+FROM gcr.io/k8s-skaffold/build_deps:7fac02958b1f507ccf26be739694181fbfbb017f as builder
 WORKDIR /skaffold
 COPY . .
 
diff --git a/deploy/skaffold/Dockerfile.deps b/deploy/skaffold/Dockerfile.deps
index 6fcfc685d56..d43f73a1557 100644
--- a/deploy/skaffold/Dockerfile.deps
+++ b/deploy/skaffold/Dockerfile.deps
@@ -54,6 +54,13 @@ ENV KIND_URL https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VE
 RUN wget -O kind "${KIND_URL}"
 RUN chmod +x kind
 
+# Download k3d
+FROM alpine:3.10 as download-k3d
+ENV K3D_VERSION v3.0.0
+ENV K3D_URL https://github.com/rancher/k3d/releases/download/${K3D_VERSION}/k3d-linux-amd64
+RUN wget -O k3d "${K3D_URL}"
+RUN chmod +x k3d
+
 # Download gcloud
 FROM alpine:3.10 as download-gcloud
 ENV GCLOUD_VERSION 276.0.0
@@ -84,6 +91,7 @@ COPY --from=download-container-structure-test container-structure-test /usr/loca
 COPY --from=download-bazel bazel /usr/local/bin/
 COPY --from=download-gcloud google-cloud-sdk/ /google-cloud-sdk/
 COPY --from=download-kind kind /usr/local/bin/
+COPY --from=download-k3d k3d /usr/local/bin/
 
 # Finish installation of bazel
 RUN bazel version