From f63f0457be8bdfee12bad21a02213939da8e45a5 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Fri, 24 May 2019 02:47:14 +0200
Subject: [PATCH] Update e2e images (#4110)

---
 Makefile                  |  2 +-
 build/run-in-docker.sh    | 18 +++---------------
 images/e2e/Dockerfile     | 14 +++++++++++++-
 images/e2e/Makefile       |  8 +++++++-
 test/e2e-image/Dockerfile |  2 +-
 test/e2e-prow/Dockerfile  |  1 -
 test/e2e-prow/Makefile    |  2 ++
 7 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/Makefile b/Makefile
index fc409fd7e..466a71fb2 100644
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,7 @@ build-plugin:
 
 .PHONY: clean
 clean:
-	rm -rf bin/ .gocache/ .env
+	rm -rf bin/ .gocache/
 
 .PHONY: static-check
 static-check:
diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
index ac2b124de..f3b9608a1 100755
--- a/build/run-in-docker.sh
+++ b/build/run-in-docker.sh
@@ -22,23 +22,14 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v05122019-7b3f69a3ba
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v05232019-ee1f36d8d
 
 DOCKER_OPTS=${DOCKER_OPTS:-""}
 
 FLAGS=$@
 
-tee .env << EOF
-PKG=${PKG:-""}
-ARCH=${ARCH:-""}
-GIT_COMMIT=${GIT_COMMIT:-""}
-TAG=${TAG:-"0.0"}
-GOARCH=${GOARCH:-""}
-GOBUILD_FLAGS=${GOBUILD_FLAGS:-"-v"}
-PWD=${PWD}
-BUSTED_ARGS=${BUSTED_ARGS:-""}
-REPO_INFO=${REPO_INFO:-local}
-EOF
+PKG=k8s.io/ingress-nginx
+ARCH=$(go env GOARCH)
 
 MINIKUBE_PATH=${HOME}/.minikube
 MINIKUBE_VOLUME="-v ${MINIKUBE_PATH}:${MINIKUBE_PATH}"
@@ -58,7 +49,4 @@ docker run                                       \
     -v /var/run/docker.sock:/var/run/docker.sock \
     ${MINIKUBE_VOLUME}                           \
     -w /go/src/${PKG}                            \
-    --env-file .env                              \
     ${E2E_IMAGE} ${FLAGS}
-
-rm .env
diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile
index 712c688fb..8de3b883d 100644
--- a/images/e2e/Dockerfile
+++ b/images/e2e/Dockerfile
@@ -63,5 +63,17 @@ RUN  luarocks install luacheck \
 RUN  go get github.com/onsi/ginkgo/ginkgo \
   && go get golang.org/x/lint/golint
 
-RUN  curl -Lo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/v1.14.1/bin/linux/amd64/kubectl \
+ARG K8S_RELEASE
+ARG ETCD_VERSION
+
+RUN wget https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/amd64/kubectl -O /usr/local/bin/kubectl \
   && chmod +x /usr/local/bin/kubectl
+
+RUN wget https://storage.googleapis.com/kubernetes-release/release/${K8S_RELEASE}/bin/linux/amd64/kube-apiserver -O /usr/local/bin/kube-apiserver \
+  && chmod +x /usr/local/bin/kube-apiserver
+
+RUN curl -L https://storage.googleapis.com/etcd/${ETCD_VERSION}/etcd-${ETCD_VERSION}-linux-amd64.tar.gz -o /tmp/etcd-${ETCD_VERSION}-linux-amd64.tar.gz \
+  && mkdir -p /tmp/etcd-download \
+  && tar xzvf /tmp/etcd-${ETCD_VERSION}-linux-amd64.tar.gz -C /tmp/etcd-download --strip-components=1 \
+  && cp /tmp/etcd-download/etcd /usr/local/bin \
+  && rm -rf /tmp/etcd-download
diff --git a/images/e2e/Makefile b/images/e2e/Makefile
index 8fb9e8566..6c303c173 100644
--- a/images/e2e/Makefile
+++ b/images/e2e/Makefile
@@ -21,7 +21,13 @@ IMAGE = $(REGISTRY)/e2e
 all: docker-build docker-push
 
 docker-build:
-	$(DOCKER) build -t $(IMAGE):$(TAG) .
+	$(DOCKER) build \
+		--pull \
+		--build-arg K8S_RELEASE=v1.14.1 \
+		--build-arg ETCD_VERSION=v3.3.12 \
+		-t $(IMAGE):$(TAG) .
 
 docker-push:
 	$(DOCKER) push $(IMAGE):$(TAG)
+	$(DOCKER) tag $(IMAGE):$(TAG) $(IMAGE):latest
+	$(DOCKER) push $(IMAGE):latest
diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile
index efc981311..ebd8cf61a 100644
--- a/test/e2e-image/Dockerfile
+++ b/test/e2e-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kubernetes-ingress-controller/e2e:v05062019-b4f2880ee AS BASE
+FROM quay.io/kubernetes-ingress-controller/e2e:v05232019-ee1f36d8d AS BASE
 
 FROM quay.io/kubernetes-ingress-controller/debian-base-amd64:0.1
 
diff --git a/test/e2e-prow/Dockerfile b/test/e2e-prow/Dockerfile
index 877151063..ffa696367 100644
--- a/test/e2e-prow/Dockerfile
+++ b/test/e2e-prow/Dockerfile
@@ -40,7 +40,6 @@ RUN apt-get update && \
     rpm && \
     rm -rf /var/lib/apt/lists/*
 
-# replace kubectl with one from K8S_RELEASE
 ARG K8S_RELEASE
 ARG ETCD_VERSION
 
diff --git a/test/e2e-prow/Makefile b/test/e2e-prow/Makefile
index c63bd5687..a072e7014 100644
--- a/test/e2e-prow/Makefile
+++ b/test/e2e-prow/Makefile
@@ -15,3 +15,5 @@ docker-build:
 
 docker-push:
 	$(DOCKER) push $(IMAGE):$(TAG)
+	$(DOCKER) tag $(IMAGE):$(TAG) $(IMAGE):latest
+	$(DOCKER) push $(IMAGE):latest