From 47031682171551a8e3532469d3a5380bb4a2ac1d Mon Sep 17 00:00:00 2001
From: Ricardo Katz <ricardo.katz@gmail.com>
Date: Sun, 5 May 2024 20:51:40 -0300
Subject: [PATCH] Bump Kubernetes version on images

---
 build/dev-env.sh            |  2 +-
 images/test-runner/Makefile | 16 ++++++++--------
 images/test-runner/TAG      |  2 +-
 test/e2e/run-chart-test.sh  |  2 +-
 test/e2e/run-kind-e2e.sh    |  2 +-
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/build/dev-env.sh b/build/dev-env.sh
index 93ed3de407..699c980308 100755
--- a/build/dev-env.sh
+++ b/build/dev-env.sh
@@ -64,7 +64,7 @@ echo "[dev-env] building image"
 make build image
 docker tag "${REGISTRY}/controller:${TAG}" "${DEV_IMAGE}"
 
-export K8S_VERSION=${K8S_VERSION:-v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f}
+export K8S_VERSION=${K8S_VERSION:-v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245}
 
 KIND_CLUSTER_NAME="ingress-nginx-dev"
 
diff --git a/images/test-runner/Makefile b/images/test-runner/Makefile
index ac0757ab28..d824271408 100644
--- a/images/test-runner/Makefile
+++ b/images/test-runner/Makefile
@@ -49,8 +49,8 @@ image:
 		--push \
 		--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
 		--build-arg GOLANG_VERSION=${GO_VERSION} \
-		--build-arg ETCD_VERSION=3.4.3-0 \
-		--build-arg K8S_RELEASE=v1.26.0 \
+		--build-arg ETCD_VERSION=3.5.13-0 \
+		--build-arg K8S_RELEASE=v1.29.2 \
 		--build-arg RESTY_CLI_VERSION=0.27 \
 		--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
 		--build-arg LUAROCKS_VERSION=3.8.0 \
@@ -58,8 +58,8 @@ image:
 		--build-arg CHART_TESTING_VERSION=3.8.0 \
 		--build-arg YAML_LINT_VERSION=1.33.0 \
 		--build-arg YAMALE_VERSION=4.0.4 \
-		--build-arg HELM_VERSION=3.11.2 \
-		--build-arg GINKGO_VERSION=2.17.1 \
+		--build-arg HELM_VERSION=3.14.4 \
+		--build-arg GINKGO_VERSION=2.17.2 \
 		--build-arg GOLINT_VERSION=latest \
 		-t ${IMAGE}:${TAG} rootfs
 
@@ -70,8 +70,8 @@ build: ensure-buildx
 		--pull \
 		--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
 		--build-arg GOLANG_VERSION=${GO_VERSION} \
-		--build-arg ETCD_VERSION=3.4.3-0 \
-		--build-arg K8S_RELEASE=v1.26.0 \
+		--build-arg ETCD_VERSION=3.5.13-0 \
+		--build-arg K8S_RELEASE=v1.29.2 \
 		--build-arg RESTY_CLI_VERSION=0.27 \
 		--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
 		--build-arg LUAROCKS_VERSION=3.8.0 \
@@ -79,8 +79,8 @@ build: ensure-buildx
 		--build-arg CHART_TESTING_VERSION=3.8.0 \
 		--build-arg YAML_LINT_VERSION=1.33.0 \
 		--build-arg YAMALE_VERSION=4.0.4 \
-		--build-arg HELM_VERSION=3.11.2 \
-		--build-arg GINKGO_VERSION=2.17.1 \
+		--build-arg HELM_VERSION=3.14.4 \
+		--build-arg GINKGO_VERSION=2.17.2 \
 		--build-arg GOLINT_VERSION=latest \
 		-t ${IMAGE}:${TAG} rootfs
 
diff --git a/images/test-runner/TAG b/images/test-runner/TAG
index 90ab6e946e..8ce995b80e 100644
--- a/images/test-runner/TAG
+++ b/images/test-runner/TAG
@@ -1 +1 @@
-v0.0.2
\ No newline at end of file
+v0.0.3
\ No newline at end of file
diff --git a/test/e2e/run-chart-test.sh b/test/e2e/run-chart-test.sh
index a453bd1b40..dadb5195dc 100755
--- a/test/e2e/run-chart-test.sh
+++ b/test/e2e/run-chart-test.sh
@@ -62,7 +62,7 @@ export KUBECONFIG="${KUBECONFIG:-$HOME/.kube/kind-config-$KIND_CLUSTER_NAME}"
 if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then
   echo "[dev-env] creating Kubernetes cluster with kind"
 
-  export K8S_VERSION=${K8S_VERSION:-v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f}
+  export K8S_VERSION=${K8S_VERSION:-v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245}
 
   kind create cluster \
     --verbosity=${KIND_LOG_LEVEL} \
diff --git a/test/e2e/run-kind-e2e.sh b/test/e2e/run-kind-e2e.sh
index 891e5dbaec..128964393d 100755
--- a/test/e2e/run-kind-e2e.sh
+++ b/test/e2e/run-kind-e2e.sh
@@ -64,7 +64,7 @@ echo "Running e2e with nginx base image ${NGINX_BASE_IMAGE}"
 if [ "${SKIP_CLUSTER_CREATION}" = "false" ]; then
   echo "[dev-env] creating Kubernetes cluster with kind"
 
-  export K8S_VERSION=${K8S_VERSION:-v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f}
+  export K8S_VERSION=${K8S_VERSION:-v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245}
 
   # delete the cluster if it exists
   if kind get clusters | grep "${KIND_CLUSTER_NAME}"; then