Skip to content

Commit 3de90b3

Browse files
Fix for intermittent traefik installation failures in parallel run for MII sample tests (#2618)
* Fix for intermittent traefik installation failures in parallel run for MII sample tests
1 parent 7393e57 commit 3de90b3

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

operator/integration-tests/model-in-image/deploy-traefik.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ source $TESTDIR/test-env.sh
3131

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

34-
TRAEFIK_NAME=${TRAEFIK_NAME:-traefik-operator}
3534
TRAEFIK_NAMESPACE=${TRAEFIK_NAMESPACE:-traefik-operator-ns}
35+
TRAEFIK_NAME=${TRAEFIK_NAME:-traefik-operator-$TRAEFIK_NAMESPACE}
3636
TRAEFIK_HTTP_NODEPORT=${TRAEFIK_HTTP_NODEPORT:-30305}
3737
TRAEFIK_HTTPS_NODEPORT=${TRAEFIK_HTTPS_NODEPORT:-30433}
3838

@@ -88,7 +88,7 @@ else
8888
--namespace $TRAEFIK_NAMESPACE \
8989
--set "kubernetes.namespaces={$TRAEFIK_NAMESPACE,$DOMAIN_NAMESPACE}" \
9090
--set "ports.web.nodePort=${TRAEFIK_HTTP_NODEPORT}" \
91-
--set "ports.websecure.nodePort=${TRAEFIK_HTTPS_NODEPORT}"
91+
--set "ports.websecure.nodePort=${TRAEFIK_HTTPS_NODEPORT}"
9292

9393
set +x
9494

operator/integration-tests/model-in-image/test-env.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ export DB_IMAGE_PULL_SECRET=${DB_IMAGE_PULL_SECRET:-docker-secret}
3636

3737
# ::: Traefik settings/defaults, set NODEPORT values to 0 to have
3838
# K8S dynamically choose the values for Traefik
39-
export TRAEFIK_NAME=${TRAEFIK_NAME:-traefik-operator}
4039
export TRAEFIK_NAMESPACE=${TRAEFIK_NAMESPACE:-traefik-operator-ns}
40+
export TRAEFIK_NAME=${TRAEFIK_NAME:-traefik-operator-$TRAEFIK_NAMESPACE}
4141
export TRAEFIK_HTTP_NODEPORT=${TRAEFIK_HTTP_NODEPORT:-30305}
4242
export TRAEFIK_HTTPS_NODEPORT=${TRAEFIK_HTTPS_NODEPORT:-30433}
4343

0 commit comments

Comments
 (0)