DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bump Kubernetes version on images (#11346)

Browse source
This commit is contained in:
Ricardo Katz 2024-05-05 23:06:28 -03:00 committed by GitHub
parent c5a54a150e
commit cfe0daace1
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build/dev-env.sh
View file

@ -64,7 +64,7 @@ echo "[dev-env] building image"
make build image make build image
docker tag "${REGISTRY}/controller:${TAG}" "${DEV_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" KIND_CLUSTER_NAME="ingress-nginx-dev"

16
images/test-runner/Makefile
View file

@ -49,8 +49,8 @@ image:
--push \ --push \
--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \ --build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
--build-arg GOLANG_VERSION=${GO_VERSION} \ --build-arg GOLANG_VERSION=${GO_VERSION} \
--build-arg ETCD_VERSION=3.4.3-0 \ --build-arg ETCD_VERSION=3.5.13-0 \
--build-arg K8S_RELEASE=v1.26.0 \ --build-arg K8S_RELEASE=v1.29.2 \
--build-arg RESTY_CLI_VERSION=0.27 \ --build-arg RESTY_CLI_VERSION=0.27 \
--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \ --build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
--build-arg LUAROCKS_VERSION=3.8.0 \ --build-arg LUAROCKS_VERSION=3.8.0 \
@ -58,8 +58,8 @@ image:
--build-arg CHART_TESTING_VERSION=3.8.0 \ --build-arg CHART_TESTING_VERSION=3.8.0 \
--build-arg YAML_LINT_VERSION=1.33.0 \ --build-arg YAML_LINT_VERSION=1.33.0 \
--build-arg YAMALE_VERSION=4.0.4 \ --build-arg YAMALE_VERSION=4.0.4 \
--build-arg HELM_VERSION=3.11.2 \ --build-arg HELM_VERSION=3.14.4 \
--build-arg GINKGO_VERSION=2.17.1 \ --build-arg GINKGO_VERSION=2.17.2 \
--build-arg GOLINT_VERSION=latest \ --build-arg GOLINT_VERSION=latest \
-t ${IMAGE}:${TAG} rootfs -t ${IMAGE}:${TAG} rootfs
@ -70,8 +70,8 @@ build: ensure-buildx
--pull \ --pull \
--build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \ --build-arg BASE_IMAGE=${NGINX_BASE_IMAGE} \
--build-arg GOLANG_VERSION=${GO_VERSION} \ --build-arg GOLANG_VERSION=${GO_VERSION} \
--build-arg ETCD_VERSION=3.4.3-0 \ --build-arg ETCD_VERSION=3.5.13-0 \
--build-arg K8S_RELEASE=v1.26.0 \ --build-arg K8S_RELEASE=v1.29.2 \
--build-arg RESTY_CLI_VERSION=0.27 \ --build-arg RESTY_CLI_VERSION=0.27 \
--build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \ --build-arg RESTY_CLI_SHA=e5f4f3128af49ba5c4d039d0554e5ae91bbe05866f60eccfa96d3653274bff90 \
--build-arg LUAROCKS_VERSION=3.8.0 \ --build-arg LUAROCKS_VERSION=3.8.0 \
@ -79,8 +79,8 @@ build: ensure-buildx
--build-arg CHART_TESTING_VERSION=3.8.0 \ --build-arg CHART_TESTING_VERSION=3.8.0 \
--build-arg YAML_LINT_VERSION=1.33.0 \ --build-arg YAML_LINT_VERSION=1.33.0 \
--build-arg YAMALE_VERSION=4.0.4 \ --build-arg YAMALE_VERSION=4.0.4 \
--build-arg HELM_VERSION=3.11.2 \ --build-arg HELM_VERSION=3.14.4 \
--build-arg GINKGO_VERSION=2.17.1 \ --build-arg GINKGO_VERSION=2.17.2 \
--build-arg GOLINT_VERSION=latest \ --build-arg GOLINT_VERSION=latest \
-t ${IMAGE}:${TAG} rootfs -t ${IMAGE}:${TAG} rootfs

2
images/test-runner/TAG
View file

@ -1 +1 @@
v0.0.2 v0.0.3

2
test/e2e/run-chart-test.sh
View file

@ -62,7 +62,7 @@ export KUBECONFIG="${KUBECONFIG:-$HOME/.kube/kind-config-$KIND_CLUSTER_NAME}"
if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then
echo "[dev-env] creating Kubernetes cluster with kind" 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 \ kind create cluster \
--verbosity=${KIND_LOG_LEVEL} \ --verbosity=${KIND_LOG_LEVEL} \

2
test/e2e/run-kind-e2e.sh
View file

@ -64,7 +64,7 @@ echo "Running e2e with nginx base image ${NGINX_BASE_IMAGE}"
if [ "${SKIP_CLUSTER_CREATION}" = "false" ]; then if [ "${SKIP_CLUSTER_CREATION}" = "false" ]; then
echo "[dev-env] creating Kubernetes cluster with kind" 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 # delete the cluster if it exists
if kind get clusters | grep "${KIND_CLUSTER_NAME}"; then if kind get clusters | grep "${KIND_CLUSTER_NAME}"; then