From 78935500ebf64ab9b8f62b8c41ab9f53ffffcdd1 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Tue, 26 May 2020 15:14:10 -0400
Subject: [PATCH] Update nginx image and go to 1.14.3

---
 Makefile                                                    | 2 +-
 build/images/ingress-controller/build-ingress-controller.sh | 2 +-
 build/images/nginx/build-nginx.sh                           | 2 +-
 build/run-in-docker.sh                                      | 2 +-
 images/e2e/Dockerfile                                       | 2 +-
 images/e2e/Makefile                                         | 4 ++--
 test/e2e-image/Dockerfile                                   | 6 ++----
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 31821aa1a..5ff805b39 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 ?= 5d67794f4fbf38ec6575476de46201b068eabf87
+BASE_TAG ?= 227f97465158f038b3c0a3bfd8299fe8d8a530e3
 
 GOARCH=$(ARCH)
 GOBUILD_FLAGS := -v
diff --git a/build/images/ingress-controller/build-ingress-controller.sh b/build/images/ingress-controller/build-ingress-controller.sh
index 8bb5f0d85..530e64671 100644
--- a/build/images/ingress-controller/build-ingress-controller.sh
+++ b/build/images/ingress-controller/build-ingress-controller.sh
@@ -67,7 +67,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu
 curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
 chmod +x /usr/local/bin/gimme
 
-eval "$(gimme 1.14.2)"
+eval "$(gimme 1.14.3)"
 
 export GOPATH="/tmp/go"
 
diff --git a/build/images/nginx/build-nginx.sh b/build/images/nginx/build-nginx.sh
index d3100e2f3..ca438ba47 100644
--- a/build/images/nginx/build-nginx.sh
+++ b/build/images/nginx/build-nginx.sh
@@ -70,7 +70,7 @@ echo ${docker_password} | docker login -u ${docker_username} --password-stdin qu
 curl -sL -o /usr/local/bin/gimme https://raw.githubusercontent.com/travis-ci/gimme/master/gimme
 chmod +x /usr/local/bin/gimme
 
-eval "$(gimme 1.14.2)"
+eval "$(gimme 1.14.3)"
 
 git clone https://github.com/kubernetes/ingress-nginx
 
diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
index ba829f72b..7748fcdfb 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:v04212020-5d67794f4
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v05262020-209405940c6
 
 DOCKER_OPTS=${DOCKER_OPTS:-}
 
diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile
index 6ad014e23..82ba6bf07 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:5d67794f4fbf38ec6575476de46201b068eabf87
+FROM quay.io/kubernetes-ingress-controller/nginx-amd64:227f97465158f038b3c0a3bfd8299fe8d8a530e3
 
 ARG GOLANG_VERSION
 ARG GOLANG_SHA
diff --git a/images/e2e/Makefile b/images/e2e/Makefile
index 65be68de3..b949e0076 100644
--- a/images/e2e/Makefile
+++ b/images/e2e/Makefile
@@ -26,8 +26,8 @@ docker-build:
 		--progress plain \
 		--build-arg K8S_RELEASE=v1.15.7 \
 		--build-arg ETCD_VERSION=v3.3.18 \
-		--build-arg GOLANG_VERSION=1.14.2 \
-		--build-arg GOLANG_SHA=98de84e69726a66da7b4e58eac41b99cbe274d7e8906eeb8a5b7eb0aadee7f7c \
+		--build-arg GOLANG_VERSION=1.14.3 \
+		--build-arg GOLANG_SHA=93023778d4d1797b7bc6a53e86c3a9b150c923953225f8a48a2d5fabc971af56 \
 		--build-arg RESTY_CLI_VERSION=0.25rc2 \
 		--build-arg RESTY_CLI_SHA=a38d850441384fa037a5922ca012dcce8708d0e4abe34ad2fe4164a01b28bdfb \
 		--build-arg CHART_TESTING_VERSION=3.0.0-beta.1 \
diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile
index 6e165b2bd..3c8a09ead 100644
--- a/test/e2e-image/Dockerfile
+++ b/test/e2e-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kubernetes-ingress-controller/e2e:v04212020-5d67794f4 AS BASE
+FROM quay.io/kubernetes-ingress-controller/e2e:v05262020-209405940c6 AS BASE
 
 FROM alpine:3.11
 
@@ -10,9 +10,7 @@ RUN apk add -U --no-cache \
     libc6-compat \
     openssl
 
-RUN curl -sSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash \
-  && helm repo add stable https://kubernetes-charts.storage.googleapis.com \
-  && helm repo update
+RUN curl -sSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
 
 COPY --from=BASE /go/bin/ginkgo /usr/local/bin/
 COPY --from=BASE /usr/local/bin/kubectl /usr/local/bin/