From 0701cafb24a44e4704a2d035045b85795bef1e38 Mon Sep 17 00:00:00 2001 From: vanajamukkara Date: Mon, 1 Nov 2021 19:45:16 +0000 Subject: [PATCH 1/4] fix helm install for traefik in parallel runs --- operator/integration-tests/model-in-image/deploy-traefik.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/operator/integration-tests/model-in-image/deploy-traefik.sh b/operator/integration-tests/model-in-image/deploy-traefik.sh index 39941bfb80b..84f8818847d 100755 --- a/operator/integration-tests/model-in-image/deploy-traefik.sh +++ b/operator/integration-tests/model-in-image/deploy-traefik.sh @@ -88,7 +88,8 @@ 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 "meta.helm.sh/release-namespace=${TRAEFIK_NAMESPACE}" set +x From c8c32ef49a631d7d08c088c01593c1263fc3aeaf Mon Sep 17 00:00:00 2001 From: vanajamukkara Date: Mon, 8 Nov 2021 17:37:27 +0000 Subject: [PATCH 2/4] add namespace in traefik name to make it unique in parallel runs --- operator/integration-tests/model-in-image/deploy-traefik.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/operator/integration-tests/model-in-image/deploy-traefik.sh b/operator/integration-tests/model-in-image/deploy-traefik.sh index 84f8818847d..2a58ea5083e 100755 --- a/operator/integration-tests/model-in-image/deploy-traefik.sh +++ b/operator/integration-tests/model-in-image/deploy-traefik.sh @@ -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} @@ -88,8 +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 "meta.helm.sh/release-namespace=${TRAEFIK_NAMESPACE}" + --set "ports.websecure.nodePort=${TRAEFIK_HTTPS_NODEPORT}" set +x From df12ab045b821a4fd7f4c75a13701d6485147135 Mon Sep 17 00:00:00 2001 From: vanajamukkara Date: Mon, 8 Nov 2021 19:23:04 +0000 Subject: [PATCH 3/4] add namespace in traefik name to make it unique in parallel runs --- operator/integration-tests/model-in-image/test-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/integration-tests/model-in-image/test-env.sh b/operator/integration-tests/model-in-image/test-env.sh index e6b9c146f9c..b1a8c79af3f 100755 --- a/operator/integration-tests/model-in-image/test-env.sh +++ b/operator/integration-tests/model-in-image/test-env.sh @@ -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} +TRAEFIK_NAME=${TRAEFIK_NAME:-traefik-operator-$TRAEFIK_NAMESPACE} export TRAEFIK_HTTP_NODEPORT=${TRAEFIK_HTTP_NODEPORT:-30305} export TRAEFIK_HTTPS_NODEPORT=${TRAEFIK_HTTPS_NODEPORT:-30433} From b0ce967a2667a9542418f7bb27622004c092ef32 Mon Sep 17 00:00:00 2001 From: vanajamukkara Date: Mon, 8 Nov 2021 19:39:39 +0000 Subject: [PATCH 4/4] add namespace in traefik name to make it unique in parallel runs --- operator/integration-tests/model-in-image/test-env.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/operator/integration-tests/model-in-image/test-env.sh b/operator/integration-tests/model-in-image/test-env.sh index b1a8c79af3f..1426682632d 100755 --- a/operator/integration-tests/model-in-image/test-env.sh +++ b/operator/integration-tests/model-in-image/test-env.sh @@ -37,7 +37,7 @@ 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_NAMESPACE=${TRAEFIK_NAMESPACE:-traefik-operator-ns} -TRAEFIK_NAME=${TRAEFIK_NAME:-traefik-operator-$TRAEFIK_NAMESPACE} +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}