From 648cb8bb0a3934312250435cb31f9cc9a10956ea Mon Sep 17 00:00:00 2001
From: Marco Ebert <marco_ebert@icloud.com>
Date: Fri, 15 Dec 2023 01:13:34 +0100
Subject: [PATCH] CI: Replace `chart-testing` image by `e2e-test-runner`.
 (#10761)

---
 hack/verify-chart-lint.sh  | 4 +---
 test/e2e/run-chart-test.sh | 5 ++---
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/hack/verify-chart-lint.sh b/hack/verify-chart-lint.sh
index 9ece681e0..1c661ae2b 100755
--- a/hack/verify-chart-lint.sh
+++ b/hack/verify-chart-lint.sh
@@ -19,6 +19,4 @@ set -o nounset
 set -o pipefail
 
 KUBE_ROOT="$( cd "$(dirname "$0")../" >/dev/null 2>&1 ; pwd -P )"
-# TODO: This is a temporary workaround while we don't update Helm Chart test
-curl https://raw.githubusercontent.com/helm/chart-testing/v3.8.0/etc/chart_schema.yaml -o /tmp/chart_schema.yaml
-ct lint --charts ${KUBE_ROOT}/charts/ingress-nginx --validate-maintainers=false --chart-yaml-schema=/tmp/chart_schema.yaml
+ct lint --charts ${KUBE_ROOT}/charts/ingress-nginx --validate-maintainers=false
diff --git a/test/e2e/run-chart-test.sh b/test/e2e/run-chart-test.sh
index cdcf729f5..eedb2bef5 100755
--- a/test/e2e/run-chart-test.sh
+++ b/test/e2e/run-chart-test.sh
@@ -104,13 +104,12 @@ if [ "${SKIP_CERT_MANAGER_CREATION:-false}" = "false" ]; then
 fi
 
 echo "[dev-env] running helm chart e2e tests..."
-# Uses a custom chart-testing image to avoid timeouts waiting for namespace deletion.
-# The changes can be found here: https://github.com/aledbf/chart-testing/commit/41fe0ae0733d0c9a538099fb3cec522e888e3d82
 docker run --rm --interactive --network host \
     --name ct \
     --volume $KUBECONFIG:/root/.kube/config \
     --volume "${DIR}/../../":/workdir \
     --workdir /workdir \
-    aledbf/chart-testing:v3.3.1-next ct install \
+    registry.k8s.io/ingress-nginx/e2e-test-runner:v20231208-4c39e6acc@sha256:0607184ca9c53c9c24a47b6f52347dd96137b05c6f276efa67051929a39e8f7a \
+        ct install \
         --charts charts/ingress-nginx \
         --helm-extra-args "--timeout 60s"