From 0c8171d4666073db3cbe1b32447213ab22e8a5cd Mon Sep 17 00:00:00 2001
From: Alejandro Pedraza <alejandro@buoyant.io>
Date: Wed, 1 Apr 2020 12:04:24 -0500
Subject: [PATCH] Fix bin/kind-load for pull requests (#4222)

* Fix bin/kind-load for pull requests

Followup to #4212

External PRs were failing because:

1) The image tarballs weren't being loaded from the `images-archives`
directory
2) Concurrent calls to `bin/kind` were attempting to download the KinD
binary simultaneously, resulting in a "text file busy" error. To avoid
that, now we just call `bin/kind` synchronously one time beforehand.
---
 .github/workflows/static_checks.yml |  1 -
 bin/kind-load                       | 11 ++++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/static_checks.yml b/.github/workflows/static_checks.yml
index 24d152585..c62280d02 100644
--- a/.github/workflows/static_checks.yml
+++ b/.github/workflows/static_checks.yml
@@ -98,7 +98,6 @@ jobs:
         ! -name docker-retag-all \
         ! -name _docker.sh \
         ! -name fmt \
-        ! -name kind-load \
         ! -name lint \
         ! -name _log.sh \
         ! -name minikube-start-hyperv.bat \
diff --git a/bin/kind-load b/bin/kind-load
index f4cde59dc..f175f646d 100755
--- a/bin/kind-load
+++ b/bin/kind-load
@@ -19,7 +19,7 @@ do
       echo "    # Load images from the local docker instance"
       echo "    bin/kind-load"
       echo ""
-      echo "    # Load images from tar files located in the current directory"
+      echo "    # Load images from tar files located under the 'image-archives' directory"
       echo "    bin/kind-load --images"
       echo ""
       echo "    # Retrieve images from a remote docker instance and then load them into KinD"
@@ -65,13 +65,18 @@ bindir=$( cd "${0%/*}" && pwd )
 
 TAG=${TAG:-$(head_root_tag)}
 
+# This is really to load the kind binary synchronously, before
+# the parallel executions below attempt doing so
+"$bindir"/kind version
+
 rm -f load_fail
 for img in proxy controller web grafana cli-bin debug cni-plugin ; do
   if [ $images ]; then
     if [ "$images_host" ]; then
-      DOCKER_HOST=$images_host docker save "$DOCKER_REGISTRY/$img:$TAG" > $img.tar
+      mkdir -p image-archives
+      DOCKER_HOST=$images_host docker save "$DOCKER_REGISTRY/$img:$TAG" > image-archives/$img.tar
     fi
-    cmd=(image-archive "$img.tar")
+    cmd=(image-archive "image-archives/$img.tar")
   else
     cmd=(docker-image "$DOCKER_REGISTRY/$img:$TAG")
   fi