From 652a8e62b709ca5842ee36c0ba5ae5efc9e158d6 Mon Sep 17 00:00:00 2001
From: Manuel Alejandro de Brito Fontes <aledbf@gmail.com>
Date: Wed, 26 Feb 2020 16:52:31 -0300
Subject: [PATCH] Update e2e image (#5174)

---
 build/run-in-docker.sh    |  2 +-
 hack/verify-chart-lint.sh |  2 +-
 images/e2e/Dockerfile     | 22 ++++++++++++++++++++++
 test/e2e-image/Dockerfile |  2 +-
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh
index c06a996d3..671a2497b 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:v02212020-07686f894
+E2E_IMAGE=quay.io/kubernetes-ingress-controller/e2e:v02262020-a830e931d
 
 DOCKER_OPTS=${DOCKER_OPTS:-}
 
diff --git a/hack/verify-chart-lint.sh b/hack/verify-chart-lint.sh
index 75879e517..c18caaba2 100755
--- a/hack/verify-chart-lint.sh
+++ b/hack/verify-chart-lint.sh
@@ -20,4 +20,4 @@ set -o pipefail
 
 KUBE_ROOT="$( cd "$(dirname "$0")../" >/dev/null 2>&1 ; pwd -P )"
 
-ct lint --charts ${KUBE_ROOT}/charts/ingress-nginx
+ct lint --charts ${KUBE_ROOT}/charts/ingress-nginx --validate-maintainers=false
diff --git a/images/e2e/Dockerfile b/images/e2e/Dockerfile
index cc66a1c02..6a994ed4b 100644
--- a/images/e2e/Dockerfile
+++ b/images/e2e/Dockerfile
@@ -22,6 +22,7 @@ ARG RESTY_CLI_SHA
 
 ARG K8S_RELEASE
 ARG ETCD_VERSION
+ARG CHART_TESTING_VERSION
 
 ENV GOPATH /go
 ENV PATH $GOPATH/bin:/usr/local/go/bin:$PATH
@@ -40,6 +41,8 @@ RUN apk add --no-cache \
   musl-dev \
   perl \
   python \
+  py-crcmod \
+  py-pip \
   openssl
 
 RUN set -eux; \
@@ -116,4 +119,23 @@ RUN wget https://storage.googleapis.com/etcd/${ETCD_VERSION}/etcd-${ETCD_VERSION
   && cp /tmp/etcd-download/etcd /usr/local/bin \
   && rm -rf /tmp/etcd-download
 
+# Install a YAML Linter
+ARG YAML_LINT_VERSION
+RUN pip install "yamllint==$YAML_LINT_VERSION"
+
+# Install Yamale YAML schema validator
+ARG YAMALE_VERSION
+RUN pip install "yamale==$YAMALE_VERSION"
+
+RUN wget https://github.com/helm/chart-testing/releases/download/v${CHART_TESTING_VERSION}/chart-testing_${CHART_TESTING_VERSION}_linux_amd64.tar.gz \
+    -O /tmp/ct-${CHART_TESTING_VERSION}-linux-amd64.tar.gz \
+  && mkdir -p /tmp/ct-download \
+  && tar xzvf /tmp/ct-${CHART_TESTING_VERSION}-linux-amd64.tar.gz -C /tmp/ct-download \
+  && cp /tmp/ct-download/ct /usr/local/bin \
+  && mkdir -p /etc/ct \
+  && cp -R /tmp/ct-download/etc/* /etc/ct \
+  && rm -rf /tmp/ct-download
+
+RUN curl -sSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
+
 WORKDIR $GOPATH
diff --git a/test/e2e-image/Dockerfile b/test/e2e-image/Dockerfile
index 77cf1705e..ced013ca7 100644
--- a/test/e2e-image/Dockerfile
+++ b/test/e2e-image/Dockerfile
@@ -1,4 +1,4 @@
-FROM quay.io/kubernetes-ingress-controller/e2e:v02212020-07686f894 AS BASE
+FROM quay.io/kubernetes-ingress-controller/e2e:v02262020-a830e931d AS BASE
 
 FROM alpine:3.11