From c2966460b4d7fad420a947f82945f2bfc73b4b07 Mon Sep 17 00:00:00 2001 From: Claudio Lorina Date: Thu, 30 Jan 2025 11:51:54 +0100 Subject: [PATCH] test: liqoctl generate peering-user --- test/e2e/pipeline/installer/liqoctl/peer.sh | 19 +++++++++++++++---- test/e2e/pipeline/installer/liqoctl/unpeer.sh | 2 +- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/test/e2e/pipeline/installer/liqoctl/peer.sh b/test/e2e/pipeline/installer/liqoctl/peer.sh index e5670f00d4..21278e594e 100755 --- a/test/e2e/pipeline/installer/liqoctl/peer.sh +++ b/test/e2e/pipeline/installer/liqoctl/peer.sh @@ -26,13 +26,24 @@ error() { } trap 'error "${BASH_SOURCE}" "${LINENO}"' ERR +SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" +# shellcheck disable=SC1091 +# shellcheck source=../../utils.sh +source "${SCRIPT_DIR}/../../utils.sh" + +mkdir -p "${TMPDIR}/kubeconfigs/generated" for i in $(seq 2 "${CLUSTER_NUMBER}") do export KUBECONFIG="${TMPDIR}/kubeconfigs/liqo_kubeconf_1" - export PROVIDER_KUBECONFIG="${TMPDIR}/kubeconfigs/liqo_kubeconf_${i}" + export PROVIDER_KUBECONFIG_ADMIN="${TMPDIR}/kubeconfigs/liqo_kubeconf_${i}" + CLUSTER_ID=$(forge_clustername "${i}") + + echo "Generating kubeconfig for consumer cluster ${i}" + "${LIQOCTL}" generate peering-user --kubeconfig "${PROVIDER_KUBECONFIG_ADMIN}" --cluster-id "${CLUSTER_ID}" > "${TMPDIR}/kubeconfigs/generated/liqo_kubeconf_${i}" + PROVIDER_KUBECONFIG="${TMPDIR}/kubeconfigs/generated/liqo_kubeconf_${i}" ARGS=(--kubeconfig "${KUBECONFIG}" --remote-kubeconfig "${PROVIDER_KUBECONFIG}") - + if [[ "${INFRA}" == "cluster-api" ]]; then ARGS=("${ARGS[@]}" --server-service-type NodePort) elif [[ "${INFRA}" == "kind" ]]; then @@ -45,14 +56,14 @@ do env echo "Kubeconfig consumer:" - cat "${KUBECONFIG}" + cat "${CONSUMER_KUBECONFIG}" echo "Kubeconfig provider:" cat "${PROVIDER_KUBECONFIG}" ARGS=("${ARGS[@]}") "${LIQOCTL}" peer "${ARGS[@]}" - + # Sleep a bit, to avoid generating a race condition with the # authentication process triggered by the incoming peering. sleep 1 diff --git a/test/e2e/pipeline/installer/liqoctl/unpeer.sh b/test/e2e/pipeline/installer/liqoctl/unpeer.sh index db804ecbe8..b2769c6752 100755 --- a/test/e2e/pipeline/installer/liqoctl/unpeer.sh +++ b/test/e2e/pipeline/installer/liqoctl/unpeer.sh @@ -44,7 +44,7 @@ CONSUMER_KUBECONFIG="${TMPDIR}/kubeconfigs/liqo_kubeconf_1" for i in $(seq 2 "${CLUSTER_NUMBER}"); do export KUBECONFIG="${CONSUMER_KUBECONFIG}" - export PROVIDER_KUBECONFIG="${TMPDIR}/kubeconfigs/liqo_kubeconf_${i}" + export PROVIDER_KUBECONFIG="${TMPDIR}/kubeconfigs/generated/liqo_kubeconf_${i}" "${LIQOCTL}" unpeer --kubeconfig "${KUBECONFIG}" --remote-kubeconfig "${PROVIDER_KUBECONFIG}" --skip-confirm done;