diff --git a/build/dev-env.sh b/build/dev-env.sh index 699c98030..6bbd8c22c 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.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245} +export K8S_VERSION=${K8S_VERSION:-v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30} KIND_CLUSTER_NAME="ingress-nginx-dev" diff --git a/build/run-in-docker.sh b/build/run-in-docker.sh index bef0edbdb..c4f3b34e0 100755 --- a/build/run-in-docker.sh +++ b/build/run-in-docker.sh @@ -26,14 +26,11 @@ set -o nounset set -o pipefail # temporal directory for the /etc/ingress-controller directory -if [[ "$OSTYPE" == darwin* ]] && [[ "$RUNTIME" == podman ]]; then +if [[ "$OSTYPE" == darwin* ]]; then mkdir -p "tmp" INGRESS_VOLUME=$(pwd)/$(mktemp -d tmp/XXXXXX) else INGRESS_VOLUME=$(mktemp -d) - if [[ "$OSTYPE" == darwin* ]]; then - INGRESS_VOLUME=/private$INGRESS_VOLUME - fi fi # make sure directory for SSL cert storage exists under ingress volume