Fix the e2e K8s test (#1842)

* Debugging the integration testing.

It seems to be consistently failing (also fix a typo in the file/leg name).

I'm disabling `-v` for `go test` because it interleaves the test output in ways that make it painful to read a single failing test's output when `t.Parallel` is involved.

* Try swapping registry:2 for the registry add-on

* Drop logf and make Logger private

scripts/integration-test.sh

@@ -24,4 +24,4 @@ docker version
 echo "Running integration tests..."
 make out/executor
 make out/warmer
-go test ./integration/... -v --bucket "${GCS_BUCKET}" --repo "${IMAGE_REPO}" --timeout 50m "$@"
+go test ./integration/... --bucket "${GCS_BUCKET}" --repo "${IMAGE_REPO}" --timeout 50m "$@"

scripts/minikube-setup.sh

@@ -15,6 +15,24 @@
 
 set -ex
 
-curl -Lo minikube https://storage.googleapis.com/minikube-builds/master/minikube-linux-amd64
-sudo install minikube /usr/local/bin/minikube
-minikube start --profile=minikube --driver=docker
+# conntrack is required for minikube 1.19 and higher for none driver
+if ! conntrack --version &>/dev/null; then
+  echo "WARNING: No contrack is not installed"
+  sudo apt-get update -qq
+  sudo apt-get -qq -y install conntrack
+fi
+
+curl -Lo minikube https://storage.googleapis.com/minikube/releases/latest/minikube-linux-amd64
+chmod +x minikube
+sudo mv minikube /usr/local/bin/
+
+sudo apt-get update
+sudo apt-get install -y liblz4-tool
+cat /proc/cpuinfo
+
+minikube start --vm-driver=none --force
+minikube status
+minikube addons enable registry
+kubectl cluster-info
+
+kubectl port-forward --namespace kube-system service/registry 5000:80 &

scripts/travis-setup.sh

@@ -20,7 +20,6 @@ sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubun
 sudo apt-get update
 sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-ce
 curl -LO https://storage.googleapis.com/container-diff/latest/container-diff-linux-amd64 && chmod +x container-diff-linux-amd64 && sudo mv container-diff-linux-amd64 /usr/local/bin/container-diff
-docker run -d -p 5000:5000 --restart always --name registry registry:2
 
 mkdir -p $HOME/.docker/
 echo '{}' > $HOME/.docker/config.json