ci: fix e2e eks

Author: fra98

docs/advanced/peering/inter-cluster-network.md

@@ -77,8 +77,8 @@ The Liqo Gateway of the first cluster will act as a client, while the one in the
 ```{admonition} Note
 You can see further configuration options with `liqoctl network connect --help`.
 
-For instance, in the previous command we have used the `--server-service-type NodePort` option to expose the service associated to the Liqo Gateway server as a NodePort.
-Alternatively, you can use the `--server-service-type LoadBalancer` option to expose the Liqo Gateway service as a LoadBalancer (if supported in your Kubernetes cluster).
+For instance, in the previous command we have used the `--gw-server-service-type NodePort` option to expose the service associated to the Liqo Gateway server as a NodePort.
+Alternatively, you can use the `--gw-server-service-type LoadBalancer` option to expose the Liqo Gateway service as a LoadBalancer (if supported in your Kubernetes cluster).
 ```
 
 In the first cluster (acting as gateway client), you can find the following resources:

pkg/liqoctl/install/eks/iam.go

@@ -69,6 +69,7 @@ func (o *Options) ensureUser(iamSvc *iam.IAM) error {
 		return nil
 	}
 
+	o.Printer.Info.Printfln("Creating IAM user %v", o.iamUser.userName)
 	createUserRequest := &iam.CreateUserInput{
 		UserName: aws.String(o.iamUser.userName),
 	}
@@ -89,6 +90,7 @@ func (o *Options) ensureUser(iamSvc *iam.IAM) error {
 		UserName: aws.String(o.iamUser.userName),
 	}
 
+	o.Printer.Info.Printfln("Creating IAM access key for user %v", o.iamUser.userName)
 	createAccessKeyResult, err := iamSvc.CreateAccessKey(createAccessKeyRequest)
 	if err != nil {
 		return err

test/e2e/pipeline/infra/eks/pre-requirements.sh

@@ -54,9 +54,9 @@ then
         return 1
     fi
     tar -xzf "eksctl_$PLATFORM.tar.gz" && rm "eksctl_$PLATFORM.tar.gz"
+    chmod +x eksctl
     mv eksctl "${EKSCTL}"
 fi
-chmod +x "${EKSCTL}"
 echo "eksctl version:"
 "${EKSCTL}" version
 
@@ -79,7 +79,7 @@ then
     unzip awscli-exe-linux-${AWS_ARCH}.zip
     ./aws/install -i "${BINDIR}/aws-tmp" -b "${BINDIR}"
     rm -rf aws awscli-exe-linux-${AWS_ARCH}.zip
+    chmod +x "${AWS_CLI}"
 fi
-chmod +x "${AWS_CLI}"
 echo "aws-cli version:"
 "${AWS_CLI}" --version

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

@@ -19,7 +19,6 @@
 # AWS_CLI               -> the path where aws-cli is stored
 # POD_CIDR_OVERLAPPING  -> the pod CIDR of the clusters is overlapping
 # CLUSTER_TEMPLATE_FILE -> the file where the cluster template is stored
-# CNI                   -> the CNI plugin used
 
 set -e           # Fail in case of error
 set -o nounset   # Fail if undefined variables are used
@@ -35,7 +34,7 @@ trap 'error "${BASH_SOURCE}" "${LINENO}"' ERR
 FILEPATH=$(realpath "$0")
 WORKDIR=$(dirname "$FILEPATH")
 
-OS_IMAGE=${OS_IMAGE:-"ubuntu-2204"}
+OS_IMAGE=${OS_IMAGE:-"Ubuntu2204"}
 
 # shellcheck disable=SC1091
 # shellcheck source=../../utils.sh
@@ -46,6 +45,10 @@ CLUSTER_NAME=cluster
 export POD_CIDR=10.200.0.0/16
 export POD_CIDR_OVERLAPPING=${POD_CIDR_OVERLAPPING:-"false"}
 
+# Strip the initial 'v' character and the patch from the k8s version 
+version=${K8S_VERSION#"v"}
+version=$(echo "${version}" | cut -d. -f1,2)
+
 PIDS=()
 
 for i in $(seq 1 "${CLUSTER_NUMBER}");
@@ -58,6 +61,7 @@ do
     "${EKSCTL}" create cluster \
         --name "${CLUSTER_NAME}" \
         --region "eu-central-1" \
+        --version "${version}" \
         --instance-types c4.large,c5.large \
         --nodes 2 \
         --managed \

test/e2e/pipeline/installer/liqo/peer.sh

@@ -38,10 +38,15 @@ do
   export KUBECONFIG="${TMPDIR}/kubeconfigs/liqo_kubeconf_1"
   export PROVIDER_KUBECONFIG_ADMIN="${TMPDIR}/kubeconfigs/liqo_kubeconf_${i}"
 
-  echo "Generating kubeconfig for consumer cluster ${i}"
-  "${LIQOCTL}" generate peering-user --kubeconfig "${PROVIDER_KUBECONFIG_ADMIN}" --consumer-cluster-id "${CLUSTER_ID}" > "${TMPDIR}/kubeconfigs/generated/liqo_kubeconf_${i}"
+  if [[ "${INFRA}" == "eks" ]]; then
+    # Do not generate peer-user on EKS since it is not supported
+    PROVIDER_KUBECONFIG=$PROVIDER_KUBECONFIG_ADMIN
+  else
+    echo "Generating kubeconfig for consumer cluster 1 on provider cluster ${i}"
+    "${LIQOCTL}" generate peering-user --kubeconfig "${PROVIDER_KUBECONFIG_ADMIN}" --consumer-cluster-id "${CLUSTER_ID}" > "${TMPDIR}/kubeconfigs/generated/liqo_kubeconf_${i}"
+    PROVIDER_KUBECONFIG="${TMPDIR}/kubeconfigs/generated/liqo_kubeconf_${i}"
+  fi
 
-  PROVIDER_KUBECONFIG="${TMPDIR}/kubeconfigs/generated/liqo_kubeconf_${i}"
   ARGS=(--kubeconfig "${KUBECONFIG}" --remote-kubeconfig "${PROVIDER_KUBECONFIG}")
 
   if [[ "${INFRA}" == "kubeadm" ]]; then
@@ -66,5 +71,5 @@ do
 
   # Sleep a bit, to avoid generating a race condition with the
   # authentication process triggered by the incoming peering.
-  sleep 1
+  sleep 3
 done

test/e2e/pipeline/installer/liqo/setup.sh

@@ -35,7 +35,7 @@ SCRIPT_DIR="$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source "${SCRIPT_DIR}/../../utils.sh"
 
 # shellcheck disable=SC1091
-# shellcheck source=../gke/const.sh
+# shellcheck source=../../infra/gke/const.sh
 source "${SCRIPT_DIR}/../../infra/gke/const.sh"
 
 setup_arch_and_os
@@ -90,11 +90,17 @@ do
     COMMON_ARGS=("${COMMON_ARGS[@]}" --eks-cluster-region="eu-central-1" --eks-cluster-name="${CLUSTER_NAME}")
     # do not fail if variables are not set
     set +u
-    if [[ "${LIQO_AWS_USERNAME}" != "" ]]; then
-      COMMON_ARGS=("${COMMON_ARGS[@]}" --user-name "${LIQO_AWS_USERNAME}")
+    if [[ "${AWS_LIQOCTL_USERNAME}" != "" ]]; then
+      COMMON_ARGS=("${COMMON_ARGS[@]}" --user-name "${AWS_LIQOCTL_USERNAME}")
     fi
-    if [[ "${LIQO_AWS_POLICY_NAME}" != "" ]]; then
-      COMMON_ARGS=("${COMMON_ARGS[@]}" --policy-name "${LIQO_AWS_POLICY_NAME}")
+    if [[ "${AWS_LIQOCTL_POLICY_NAME}" != "" ]]; then
+      COMMON_ARGS=("${COMMON_ARGS[@]}" --policy-name "${AWS_LIQOCTL_POLICY_NAME}")
+    fi
+    if [[ "${AWS_LIQOCTL_ACCESS_KEY_ID}" != "" ]]; then
+      COMMON_ARGS=("${COMMON_ARGS[@]}" --access-key-id "${AWS_LIQOCTL_ACCESS_KEY_ID}")
+    fi
+    if [[ "${AWS_LIQOCTL_SECRET_ACCESS_KEY}" != "" ]]; then
+      COMMON_ARGS=("${COMMON_ARGS[@]}" --secret-access-key "${AWS_LIQOCTL_SECRET_ACCESS_KEY}")
     fi
     set -u
   fi

test/e2e/pipeline/installer/liqo/unpeer.sh

@@ -50,10 +50,16 @@ for i in $(seq 2 "${CLUSTER_NUMBER}");
 do
   export KUBECONFIG="${CONSUMER_KUBECONFIG}"
   export PROVIDER_KUBECONFIG_ADMIN="${TMPDIR}/kubeconfigs/liqo_kubeconf_${i}"
-  export PROVIDER_KUBECONFIG="${TMPDIR}/kubeconfigs/generated/liqo_kubeconf_${i}"
-
-  "${LIQOCTL}" unpeer --kubeconfig "${KUBECONFIG}" --remote-kubeconfig "${PROVIDER_KUBECONFIG}" --skip-confirm
-  "${LIQOCTL}" delete peering-user --kubeconfig "${PROVIDER_KUBECONFIG_ADMIN}" --consumer-cluster-id "${CLUSTER_ID}"
+  
+  if [[ "${INFRA}" == "eks" ]]; then
+    # Do not use peer-user on EKS since it is not supported
+    PROVIDER_KUBECONFIG=$PROVIDER_KUBECONFIG_ADMIN
+    "${LIQOCTL}" unpeer --kubeconfig "${KUBECONFIG}" --remote-kubeconfig "${PROVIDER_KUBECONFIG}" --skip-confirm
+  else
+    PROVIDER_KUBECONFIG="${TMPDIR}/kubeconfigs/generated/liqo_kubeconf_${i}"
+    "${LIQOCTL}" unpeer --kubeconfig "${KUBECONFIG}" --remote-kubeconfig "${PROVIDER_KUBECONFIG}" --skip-confirm
+    "${LIQOCTL}" delete peering-user --kubeconfig "${PROVIDER_KUBECONFIG_ADMIN}" --consumer-cluster-id "${CLUSTER_ID}"
+  fi
 done;
 
 # check that the peering is correctly removed

test/e2e/pipeline/utils.sh

@@ -73,10 +73,9 @@ function check_supported_arch_and_os(){
 function forge_clustername() {
   local index=$1
   RUNNER_NAME=${RUNNER_NAME:-"test"}
-  RUNNER_NAME=$(echo "${RUNNER_NAME}" | tr -d ' ' | tr '[:upper:]' '[:lower:]')
-  RUNNER_NAME=${RUNNER_NAME#liqo-runner-*-}
   # Replace spaces and invalid characters with dashes, ensure it's valid for Kubernetes labels
-  RUNNER_NAME=$(echo "${RUNNER_NAME}" | tr ' ' '-' | tr -c 'a-zA-Z0-9-_.' '-')
+  RUNNER_NAME=$(echo "${RUNNER_NAME}" | tr ' ' '-' | tr -c 'a-zA-Z0-9-_.' '-' | tr '[:upper:]' '[:lower:]' | tr -s '-')
+  RUNNER_NAME=${RUNNER_NAME#liqo-runner-*-}
   local BASE_CLUSTER_NAME="cl-${RUNNER_NAME}-"
   echo "${BASE_CLUSTER_NAME}${index}"
 }