From d4e065799155ac10e9624de9ab7afad40b06acc0 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Tue, 21 Apr 2020 22:19:00 -0400
Subject: [PATCH] Update nginx image to fix openssl CVE

---
 Makefile                  | 2 +-
 build/run-in-docker.sh    | 2 +-
 images/e2e-prow/Makefile  | 2 +-
 images/e2e/Dockerfile     | 2 +-
 test/e2e-image/Dockerfile | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index d55355573..97057cd85 100644
--- a/Makefile
+++ b/Makefile
@@ -62,7 +62,7 @@ endif
 REGISTRY ?= quay.io/kubernetes-ingress-controller
 
 BASE_IMAGE ?= quay.io/kubernetes-ingress-controller/nginx
-BASE_TAG ?= 914aad2ae368dfd0dc56f664bda9da018b1eae92
+BASE_TAG ?= 5d67794f4fbf38ec6575476de46201b068eabf87
 
 GOARCH=$(ARCH)
 GOBUILD_FLAGS := -v
diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
index 44474b66f..ba829f72b 100755
--- a/build/run-in-docker.sh
+++ b/build/run-in-docker.sh
@@ -34,7 +34,7 @@ function cleanup {
 }
 trap cleanup EXIT
 
-E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04142020-0257068b9
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v04212020-5d67794f4
 
 DOCKER_OPTS=${DOCKER_OPTS:-}
 
diff --git a/images/e2e-prow/Makefile b/images/e2e-prow/Makefile
index bc70fb7aa..3e8824819 100644
--- a/images/e2e-prow/Makefile
+++ b/images/e2e-prow/Makefile
@@ -13,7 +13,7 @@ docker-build:
 		--build-arg K8S_RELEASE=v1.17.0 \
 		--build-arg ETCD_VERSION=v3.3.18 \
 		--build-arg KIND_VERSION=v0.7.0 \
-		--build-arg GOLANG_VERSION=1.14.2 \
+		--build-arg GO_VERSION=1.14.2 \
 		-t $(IMAGE):$(TAG) .
 
 docker-push:
diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile
index e62160a60..6ad014e23 100644
--- a/images/e2e/Dockerfile
+++ b/images/e2e/Dockerfile
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM quay.io/kubernetes-ingress-controller/nginx-amd64:914aad2ae368dfd0dc56f664bda9da018b1eae92
+FROM quay.io/kubernetes-ingress-controller/nginx-amd64:5d67794f4fbf38ec6575476de46201b068eabf87
 
 ARG GOLANG_VERSION
 ARG GOLANG_SHA
diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile
index 52422ff92..6e165b2bd 100644
--- a/test/e2e-image/Dockerfile
+++ b/test/e2e-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kubernetes-ingress-controller/e2e:v04172020-6e8c68d88 AS BASE
+FROM quay.io/kubernetes-ingress-controller/e2e:v04212020-5d67794f4 AS BASE
 
 FROM alpine:3.11