From d1e6738239b790ec67ba41b2cbc091df62f21632 Mon Sep 17 00:00:00 2001 From: Ryan Richard Date: Thu, 6 Mar 2025 11:37:42 -0800 Subject: [PATCH] skip deploying test tools proxy server when not needed --- .../prepare-cluster-for-integration-tests.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pipelines/shared-helpers/prepare-cluster-for-integration-tests.sh b/pipelines/shared-helpers/prepare-cluster-for-integration-tests.sh index d13ff22b1..de5b347d6 100755 --- a/pipelines/shared-helpers/prepare-cluster-for-integration-tests.sh +++ b/pipelines/shared-helpers/prepare-cluster-for-integration-tests.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright 2020-2024 the Pinniped contributors. All Rights Reserved. +# Copyright 2020-2025 the Pinniped contributors. All Rights Reserved. # SPDX-License-Identifier: Apache-2.0 set -euo pipefail @@ -609,18 +609,19 @@ if [[ "${DEPLOY_TEST_TOOLS:-no}" == "yes" ]]; then ]" fi - dex_optional_ytt_values=() + tools_optional_ytt_values=() if [[ "${USE_LOAD_BALANCERS_FOR_DEX_AND_SUPERVISOR:-no}" == "yes" ]]; then - dex_optional_ytt_values+=("--data-value=dex_issuer_hostname=${dex_loadbalancer_public_ip_or_hostname}") + tools_optional_ytt_values+=("--data-value=dex_issuer_hostname=${dex_loadbalancer_public_ip_or_hostname}") + tools_optional_ytt_values+=("--data-value=deploy_proxy=false") fi echo "Deploying Tools to the cluster..." - echo "Using ytt optional flags:" "${dex_optional_ytt_values[@]}" + echo "Using ytt optional flags:" "${tools_optional_ytt_values[@]}" ytt --file . \ --data-value-yaml "supervisor_redirect_uris=${supervisor_redirect_uris}" \ --data-value "pinny_ldap_password=$ldap_test_password" \ --data-value "pinny_bcrypt_passwd_hash=$(htpasswd -nbBC 10 x "$dex_test_password" | sed -e "s/^x://")" \ - ${dex_optional_ytt_values[@]+"${dex_optional_ytt_values[@]}"} \ + ${tools_optional_ytt_values[@]+"${tools_optional_ytt_values[@]}"} \ >"$manifest" echo