Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions operator/integration-tests/model-in-image/deploy-traefik.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ source $TESTDIR/test-env.sh

WORKDIR=${WORKDIR:-/tmp/$USER/model-in-image-sample-work-dir}

TRAEFIK_NAME=${TRAEFIK_NAME:-traefik-operator}
TRAEFIK_NAMESPACE=${TRAEFIK_NAMESPACE:-traefik-operator-ns}
TRAEFIK_NAME=${TRAEFIK_NAME:-traefik-operator-$TRAEFIK_NAMESPACE}
TRAEFIK_HTTP_NODEPORT=${TRAEFIK_HTTP_NODEPORT:-30305}
TRAEFIK_HTTPS_NODEPORT=${TRAEFIK_HTTPS_NODEPORT:-30433}

Expand Down Expand Up @@ -88,7 +88,7 @@ else
--namespace $TRAEFIK_NAMESPACE \
--set "kubernetes.namespaces={$TRAEFIK_NAMESPACE,$DOMAIN_NAMESPACE}" \
--set "ports.web.nodePort=${TRAEFIK_HTTP_NODEPORT}" \
--set "ports.websecure.nodePort=${TRAEFIK_HTTPS_NODEPORT}"
--set "ports.websecure.nodePort=${TRAEFIK_HTTPS_NODEPORT}"

set +x

Expand Down
2 changes: 1 addition & 1 deletion operator/integration-tests/model-in-image/test-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ export DB_IMAGE_PULL_SECRET=${DB_IMAGE_PULL_SECRET:-docker-secret}

# ::: Traefik settings/defaults, set NODEPORT values to 0 to have
# K8S dynamically choose the values for Traefik
export TRAEFIK_NAME=${TRAEFIK_NAME:-traefik-operator}
export TRAEFIK_NAMESPACE=${TRAEFIK_NAMESPACE:-traefik-operator-ns}
export TRAEFIK_NAME=${TRAEFIK_NAME:-traefik-operator-$TRAEFIK_NAMESPACE}
export TRAEFIK_HTTP_NODEPORT=${TRAEFIK_HTTP_NODEPORT:-30305}
export TRAEFIK_HTTPS_NODEPORT=${TRAEFIK_HTTPS_NODEPORT:-30433}

Expand Down