Prepare switch to gcr.io
This commit is contained in:
parent
6c72e42fb6
commit
86534b5124
8 changed files with 22 additions and 21 deletions
|
|
@ -2,7 +2,7 @@
|
|||
fullnameOverride: nginx-ingress
|
||||
controller:
|
||||
image:
|
||||
repository: ingress-controller/nginx-ingress-controller
|
||||
repository: ingress-controller/controller
|
||||
tag: 1.0.0-dev
|
||||
extraArgs:
|
||||
healthz-port: "9090"
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
fullnameOverride: nginx-ingress
|
||||
controller:
|
||||
image:
|
||||
repository: ingress-controller/nginx-ingress-controller
|
||||
repository: ingress-controller/controller
|
||||
tag: 1.0.0-dev
|
||||
containerPort:
|
||||
http: "1080"
|
||||
|
|
|
|||
|
|
@ -41,10 +41,10 @@ export KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-ingress-nginx-dev}
|
|||
export KUBECONFIG="${KUBECONFIG:-$HOME/.kube/kind-config-$KIND_CLUSTER_NAME}"
|
||||
|
||||
# Disable execution if running as a Prow job
|
||||
if [[ ! -z ${PROW_JOB_ID:-} ]]; then
|
||||
echo "skipping execution..."
|
||||
exit 0
|
||||
fi
|
||||
#if [[ ! -z ${PROW_JOB_ID:-} ]]; then
|
||||
# echo "skipping execution..."
|
||||
# exit 0
|
||||
#fi
|
||||
|
||||
if [ "${SKIP_CLUSTER_CREATION:-false}" = "false" ]; then
|
||||
echo "[dev-env] creating Kubernetes cluster with kind"
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@ trap cleanup EXIT
|
|||
export KIND_CLUSTER_NAME=${KIND_CLUSTER_NAME:-ingress-nginx-dev}
|
||||
|
||||
# Disable execution if running as a Prow job
|
||||
if [[ ! -z ${PROW_JOB_ID:-} ]]; then
|
||||
echo "skipping execution..."
|
||||
exit 0
|
||||
fi
|
||||
#if [[ ! -z ${PROW_JOB_ID:-} ]]; then
|
||||
# echo "skipping execution..."
|
||||
# exit 0
|
||||
#fi
|
||||
|
||||
if ! command -v kind --version &> /dev/null; then
|
||||
echo "kind is not installed. Use the package manager or visit the official site https://kind.sigs.k8s.io/"
|
||||
|
|
@ -96,7 +96,7 @@ KIND_WORKERS=$(kind get nodes --name="${KIND_CLUSTER_NAME}" | grep worker | awk
|
|||
echo "[dev-env] copying docker images to cluster..."
|
||||
|
||||
kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} nginx-ingress-controller:e2e
|
||||
kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/nginx-ingress-controller:${TAG}
|
||||
kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/controller:${TAG}
|
||||
#kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/fastcgi-helloserver:${TAG}
|
||||
#kind load docker-image --name="${KIND_CLUSTER_NAME}" --nodes=${KIND_WORKERS} ${REGISTRY}/echo:${TAG}
|
||||
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ else
|
|||
fullnameOverride: nginx-ingress
|
||||
controller:
|
||||
image:
|
||||
repository: ingress-controller/nginx-ingress-controller
|
||||
repository: ingress-controller/controller
|
||||
tag: 1.0.0-dev
|
||||
scope:
|
||||
enabled: true
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue