Skip to content

Commit cfe0daa

Browse files
authored
Bump Kubernetes version on images (#11346)
1 parent c5a54a1 commit cfe0daa

File tree

5 files changed

+12
-12
lines changed

5 files changed

+12
-12
lines changed

build/dev-env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ echo "[dev-env] building image"
6464
make build image
6565
docker tag "${REGISTRY}/controller:${TAG}" "${DEV_IMAGE}"
6666

67-
export K8S_VERSION=${K8S_VERSION:-v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f}
67+
export K8S_VERSION=${K8S_VERSION:-v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245}
6868

6969
KIND_CLUSTER_NAME="ingress-nginx-dev"
7070

images/test-runner/Makefile

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,17 @@ image:
4949
--push \
5050
--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
5151
--build-arg GOLANG_VERSION=${GO_VERSION} \
52-
--build-arg ETCD_VERSION=3.4.3-0 \
53-
--build-arg K8S_RELEASE=v1.26.0 \
52+
--build-arg ETCD_VERSION=3.5.13-0 \
53+
--build-arg K8S_RELEASE=v1.29.2 \
5454
--build-arg RESTY_CLI_VERSION=0.27 \
5555
--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
5656
--build-arg LUAROCKS_VERSION=3.8.0 \
5757
--build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7 \
5858
--build-arg CHART_TESTING_VERSION=3.8.0 \
5959
--build-arg YAML_LINT_VERSION=1.33.0 \
6060
--build-arg YAMALE_VERSION=4.0.4 \
61-
--build-arg HELM_VERSION=3.11.2 \
62-
--build-arg GINKGO_VERSION=2.17.1 \
61+
--build-arg HELM_VERSION=3.14.4 \
62+
--build-arg GINKGO_VERSION=2.17.2 \
6363
--build-arg GOLINT_VERSION=latest \
6464
-t ${IMAGE}:${TAG} rootfs
6565

@@ -70,17 +70,17 @@ build: ensure-buildx
7070
--pull \
7171
--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
7272
--build-arg GOLANG_VERSION=${GO_VERSION} \
73-
--build-arg ETCD_VERSION=3.4.3-0 \
74-
--build-arg K8S_RELEASE=v1.26.0 \
73+
--build-arg ETCD_VERSION=3.5.13-0 \
74+
--build-arg K8S_RELEASE=v1.29.2 \
7575
--build-arg RESTY_CLI_VERSION=0.27 \
7676
--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
7777
--build-arg LUAROCKS_VERSION=3.8.0 \
7878
--build-arg LUAROCKS_SHA=ab6612ca9ab87c6984871d2712d05525775e8b50172701a0a1cabddf76de2be7 \
7979
--build-arg CHART_TESTING_VERSION=3.8.0 \
8080
--build-arg YAML_LINT_VERSION=1.33.0 \
8181
--build-arg YAMALE_VERSION=4.0.4 \
82-
--build-arg HELM_VERSION=3.11.2 \
83-
--build-arg GINKGO_VERSION=2.17.1 \
82+
--build-arg HELM_VERSION=3.14.4 \
83+
--build-arg GINKGO_VERSION=2.17.2 \
8484
--build-arg GOLINT_VERSION=latest \
8585
-t ${IMAGE}:${TAG} rootfs
8686

images/test-runner/TAG

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v0.0.2
1+
v0.0.3

test/e2e/run-chart-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ export KUBECONFIG="${KUBECONFIG:-$HOME/.kube/kind-config-$KIND_CLUSTER_NAME}"
6262
if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then
6363
echo "[dev-env] creating Kubernetes cluster with kind"
6464

65-
export K8S_VERSION=${K8S_VERSION:-v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f}
65+
export K8S_VERSION=${K8S_VERSION:-v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245}
6666

6767
kind create cluster \
6868
--verbosity=${KIND_LOG_LEVEL} \

test/e2e/run-kind-e2e.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ echo "Running e2e with nginx base image ${NGINX_BASE_IMAGE}"
6464
if [ "${SKIP_CLUSTER_CREATION}" = "false" ]; then
6565
echo "[dev-env] creating Kubernetes cluster with kind"
6666

67-
export K8S_VERSION=${K8S_VERSION:-v1.26.3@sha256:61b92f38dff6ccc29969e7aa154d34e38b89443af1a2c14e6cfbd2df6419c66f}
67+
export K8S_VERSION=${K8S_VERSION:-v1.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245}
6868

6969
# delete the cluster if it exists
7070
if kind get clusters | grep "${KIND_CLUSTER_NAME}"; then

0 commit comments

Comments
 (0)