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

Merge branch 'main' into feat/add-internal-service-labels

Browse source
This commit is contained in:
Samuel Arogbonlo 2025-01-22 06:00:29 +01:00 committed by GitHub
commit bf9b05b0ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 5 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.29.2@sha256:51a1434a5397193442f0be2a297b488b6c919ce8a3931be0ce822606ea5ca245} export K8S_VERSION=${K8S_VERSION:-v1.31.4@sha256:2cb39f7295fe7eafee0842b1052a599a4fb0f8bcf3f83d96c7f4864c357c6c30}
KIND_CLUSTER_NAME="ingress-nginx-dev" KIND_CLUSTER_NAME="ingress-nginx-dev"

5
build/run-in-docker.sh
View file

@ -26,14 +26,11 @@ set -o nounset
set -o pipefail set -o pipefail
# temporal directory for the /etc/ingress-controller directory # temporal directory for the /etc/ingress-controller directory
if [[ "$OSTYPE" == darwin* ]] && [[ "$RUNTIME" == podman ]]; then if [[ "$OSTYPE" == darwin* ]]; then
mkdir -p "tmp" mkdir -p "tmp"
INGRESS_VOLUME=$(pwd)/$(mktemp -d tmp/XXXXXX) INGRESS_VOLUME=$(pwd)/$(mktemp -d tmp/XXXXXX)
else else
INGRESS_VOLUME=$(mktemp -d) INGRESS_VOLUME=$(mktemp -d)
if [[ "$OSTYPE" == darwin* ]]; then
INGRESS_VOLUME=/private$INGRESS_VOLUME
fi
fi fi
# make sure directory for SSL cert storage exists under ingress volume # make sure directory for SSL cert storage exists under ingress volume