Skip to content

Commit f214304

Browse files
aleoliadamjensenbot
authored andcommitted
ci: e2e eks
1 parent f0a690a commit f214304

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

test/e2e/pipeline/infra/eks/setup.sh

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ trap 'error "${BASH_SOURCE}" "${LINENO}"' ERR
3535
FILEPATH=$(realpath "$0")
3636
WORKDIR=$(dirname "$FILEPATH")
3737

38+
OS_IMAGE=${OS_IMAGE:-"ubuntu-2204"}
39+
3840
# shellcheck disable=SC1091
3941
# shellcheck source=../../utils.sh
4042
source "$WORKDIR/../../utils.sh"
@@ -60,7 +62,7 @@ do
6062
--nodes 2 \
6163
--managed \
6264
--alb-ingress-access \
63-
--node-ami-family "AmazonLinux2" \
65+
--node-ami-family "${OS_IMAGE}" \
6466
--vpc-cidr "$POD_CIDR" \
6567
--kubeconfig "${TMPDIR}/kubeconfigs/liqo_kubeconf_${i}" &
6668
PIDS+=($!)
@@ -80,7 +82,7 @@ do
8082
install_local_path_storage "${TMPDIR}/kubeconfigs/liqo_kubeconf_${i}"
8183

8284
# Install metrics-server
83-
install_metrics_server "${TMPDIR}/kubeconfigs/liqo_kubeconf_${i}"
85+
# install_metrics_server "${TMPDIR}/kubeconfigs/liqo_kubeconf_${i}"
8486

8587
# Install AWS Load Balancer Controller
8688
"${HELM}" repo add eks https://aws.github.io/eks-charts
@@ -90,3 +92,6 @@ do
9092
--set clusterName="${CLUSTER_NAME}" \
9193
--kubeconfig "${TMPDIR}/kubeconfigs/liqo_kubeconf_${i}"
9294
done
95+
96+
# Wait for system components to be started
97+
sleep 120

test/e2e/pipeline/utils.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,8 @@ function forge_clustername() {
7575
RUNNER_NAME=${RUNNER_NAME:-"test"}
7676
RUNNER_NAME=$(echo "${RUNNER_NAME}" | tr -d ' ' | tr '[:upper:]' '[:lower:]')
7777
RUNNER_NAME=${RUNNER_NAME#liqo-runner-*-}
78+
# Replace spaces and invalid characters with dashes, ensure it's valid for Kubernetes labels
79+
RUNNER_NAME=$(echo "${RUNNER_NAME}" | tr ' ' '-' | tr -c 'a-zA-Z0-9-_.' '-')
7880
local BASE_CLUSTER_NAME="cl-${RUNNER_NAME}-"
7981
echo "${BASE_CLUSTER_NAME}${index}"
8082
}

0 commit comments

Comments
 (0)