From 41b7d31548af09caaa80a0b657dd57cf4792f30b Mon Sep 17 00:00:00 2001 From: michaelschiff Date: Wed, 6 Nov 2024 01:08:42 -0800 Subject: [PATCH] adds option to overide CLUSTER argument in k8s_test_setup using the K8S_TEST_CLUSTER test_env variable --- skylib/k8s_test_namespace.sh.tpl | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/skylib/k8s_test_namespace.sh.tpl b/skylib/k8s_test_namespace.sh.tpl index 9c704446..d1319324 100644 --- a/skylib/k8s_test_namespace.sh.tpl +++ b/skylib/k8s_test_namespace.sh.tpl @@ -39,7 +39,13 @@ NAMESPACE_NAME_FILE=${TEST_UNDECLARED_OUTPUTS_DIR}/namespace KUBECONFIG_FILE=${TEST_UNDECLARED_OUTPUTS_DIR}/kubeconfig # get cluster and username from provided configuration -CLUSTER=$(cat ${CLUSTER_FILE}) +if [ -n "${K8S_TEST_CLUSTER:-}" ] +then + CLUSTER=${K8S_TEST_CLUSTER} +else + CLUSTER=$(cat ${CLUSTER_FILE}) +fi + USER=$(${KUBECTL} --kubeconfig=${KUBECONFIG} config view -o jsonpath='{.users[?(@.name == '"\"${CLUSTER}\")].name}") echo "Cluster: ${CLUSTER}" >&2