From 8de16f08487983b55e4cb8c70ffa8f426f88589a Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Wed, 15 May 2019 20:43:12 +0200
Subject: [PATCH 1/2] Bump gitsrv's version

In order for the initialization to retry if there is a netwroking glitch
---
 test/e2e/git-dep.yaml | 2 +-
 test/e2e/known_hosts  | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/test/e2e/git-dep.yaml b/test/e2e/git-dep.yaml
index 0a263f68a..0b0da2041 100644
--- a/test/e2e/git-dep.yaml
+++ b/test/e2e/git-dep.yaml
@@ -17,7 +17,7 @@ spec:
         name: gitsrv
     spec:
       containers:
-      - image: stefanprodan/gitsrv:0.0.5
+      - image: stefanprodan/gitsrv:0.0.12
         name: git
         env:
         - name: REPO
diff --git a/test/e2e/known_hosts b/test/e2e/known_hosts
index 48c28ec97..27da08378 100644
--- a/test/e2e/known_hosts
+++ b/test/e2e/known_hosts
@@ -1,3 +1,4 @@
-gitsrv ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDt65M0saFA6Ewsjc8mQ405bI406BsFSJrbGz9GFrbWBn0Rs3Loi4S6ADWgTWlcspHvbfmf7vXW9oiTjxeke8oHPCfFYrHFdPK26Big2J1kE2DzRONizZWcdw8dpqRhvxlt2+/EJuuay8CGXz3VLCV8NgJc5AYmAwNPknUhWKxaAzjwvRd/0cyXr4vvcTDcmwR63oiWcRPkHCZ5LClFuZE065Ulm2o6CgItl+e6M5ouDSJWZDpYWWmmJJJv1DQoRruNbaf5f4bgWVkKjrQ/0cA4iWWlkwJMlAWQgp9saD0G2F83hrf2XapM/clWTFybkzPqPqaw2BEwXP6vWp6A1iUR
-gitsrv ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBM6WyUxQRPtZhYLxjG6YRQOHD/SX/+uI4XBo44UTSu21uqmf/lG8cLWTdMVzDlUDY9/Dx4tFz96LT97kUC1pLJs=
-gitsrv ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAMv1z2YnDug5M4Klp3FMbBvw9NdFrx7Om5uEKFQs07t
+# generated with "ssh-keyscan gitsrv"
+gitsrv ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC2WoJ2k+WA54pdxw5EGhg9CQBHKDVjHzNNlgRfTGrQBpgQT3/HEBi6BGi2ZmS6o6W9EJfzYzl3PvC+JY6BqcdM8XqbDazC1rkGtlycHd+dFT/TmWvBqJ2Oh+oJNL7IgpjBPJJMdAEc9nzUTTYa7V2A9SeaAyQJKGaftZhHEXTxkxxbWP2an7bzyw9QNCiF/ogQ79DPsp7ly4v4KgeGLSm9AoT/HO5+kJwXX3yQ1hKrFZyhzhaYiwzdApc3iUJtUEz1lKVX+63+WN6qhkbCUjlhfOGyT3qk18sMU6raqKt8uuQeR9f4/xkMXGWQuULhjGwOkju+8Dma8GvnhKKwHf5V
+gitsrv ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFhuyD3SzMaTye/OX51Jb3fgZDxhGnXgJQ6oFvSSwqDGDm4fcueHE979xEPolNe9hn6jGg/2DS3xkU8boPKv8mo=
+gitsrv ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAbLc9veRHa/l/kK6hmRWMA+QoWd8vLtLHbm4v6wj8XU

From d4ea618a6c667371eb3a3516995d1b5314acd8e5 Mon Sep 17 00:00:00 2001
From: Alfonso Acosta <fons@syntacticsugar.consulting>
Date: Thu, 16 May 2019 11:46:08 +0200
Subject: [PATCH 2/2] Pin Kind's version to 0.2.1

Using master broke connectivity with the external world
(at least when used CircleCI)
---
 test/e2e/e2e-kind.sh | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/e2e/e2e-kind.sh b/test/e2e/e2e-kind.sh
index 99b845f84..41ba82362 100755
--- a/test/e2e/e2e-kind.sh
+++ b/test/e2e/e2e-kind.sh
@@ -12,9 +12,11 @@ chmod +x kubectl && \
 sudo mv kubectl /usr/local/bin/
 
 echo ">>> Building sigs.k8s.io/kind"
-cd $HOME
-GO111MODULE="on" go get -u sigs.k8s.io/kind@master
-cd $REPO_ROOT
+# Hairy way to clone and build version 0.2.1 of Kind since it doesn't support Go Modules:
+mkdir -p $GOPATH/src/sigs.k8s.io
+git clone https://github.com/kubernetes-sigs/kind.git $GOPATH/src/sigs.k8s.io/kind
+git -C $GOPATH/src/sigs.k8s.io/kind checkout tags/0.2.1
+go install sigs.k8s.io/kind
 
 echo ">>> Installing kind"
 sudo cp $GOPATH/bin/kind /usr/local/bin/