test: update vars for AWS cluster

This PR updates to use the newest var setup from our capi templates. Signed-off-by: Spencer Smith <spencer.smith@talos-systems.com> (cherry picked from commit c8e404e)
siderolabs · Oct 25, 2021 · 0a51dcb · 0a51dcb
1 parent a770bbe
commit 0a51dcb
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/hack/test/e2e-aws.sh b/hack/test/e2e-aws.sh
@@ -53,29 +53,29 @@ function setup {
 
   ## Cluster-wide vars
   export CLUSTER_NAME=${NAME_PREFIX}
-  export REGION=us-east-1
-  export SSH_KEY=talos-e2e
-  export VPC_ID=vpc-ff5c5687
-  export SUBNET=subnet-c4e9b3a0
-  export CLOUD_PROVIDER_VERSION=v1.20.0-alpha.0
+  export AWS_REGION=us-east-1
+  export AWS_SSH_KEY_NAME=talos-e2e
+  export AWS_VPC_ID=vpc-ff5c5687
+  export AWS_SUBNET=subnet-c4e9b3a0
+  export CALICO_VERSION=v3.18
+  export AWS_CLOUD_PROVIDER_VERSION=v1.20.0-alpha.0
 
   ## Control plane vars
-  export CP_COUNT=3
-  export CP_INSTANCE_TYPE=t3.large
-  export CP_VOL_SIZE=50
-  export CP_AMI_ID=${ami}
-  export CP_ADDL_SEC_GROUPS='[{id: sg-ebe8e59f}]'
-  export CP_IAM_PROFILE=CAPI_AWS_ControlPlane
+  export CONTROL_PLANE_MACHINE_COUNT=3
+  export AWS_CONTROL_PLANE_MACHINE_TYPE=t3.large
+  export AWS_CONTROL_PLANE_VOL_SIZE=50
+  export AWS_CONTROL_PLANE_AMI_ID=${ami}
+  export AWS_CONTROL_PLANE_ADDL_SEC_GROUPS='[{id: sg-ebe8e59f}]'
+  export AWS_CONTROL_PLANE_IAM_PROFILE=CAPI_AWS_ControlPlane
 
   ## Worker vars
-  export WORKER_COUNT=3
-  export WORKER_INSTANCE_TYPE=t3.large
-  export WORKER_VOL_SIZE=50
-  export WORKER_AMI_ID=${ami}
-  export WORKER_ADDL_SEC_GROUPS='[{id: sg-ebe8e59f}]'
-  export WORKER_IAM_PROFILE=CAPI_AWS_Worker
-
-  ## TODO: update to talos-systems once merged
+  export WORKER_MACHINE_COUNT=3
+  export AWS_NODE_MACHINE_TYPE=t3.large
+  export AWS_NODE_VOL_SIZE=50
+  export AWS_NODE_AMI_ID=${ami}
+  export AWS_NODE_ADDL_SEC_GROUPS='[{id: sg-ebe8e59f}]'
+  export AWS_NODE_IAM_PROFILE=CAPI_AWS_Worker
+
   ${CLUSTERCTL} config cluster ${NAME_PREFIX} \
     --kubeconfig /tmp/e2e/docker/kubeconfig \
     --from https://github.com/talos-systems/cluster-api-templates/blob/main/aws/standard/standard.yaml > ${TMP}/cluster.yaml

diff --git a/hack/test/e2e-docker.sh b/hack/test/e2e-docker.sh
@@ -13,7 +13,7 @@ function create_cluster {
   "${TALOSCTL}" cluster create \
     --provisioner="${PROVISIONER}" \
     --name="${CLUSTER_NAME}" \
-    --kubernetes-version=${K8S_VERSION} \
+    --kubernetes-version=${KUBERNETES_VERSION} \
     --image="${IMAGE}" \
     --masters=1 \
     --workers=1 \

diff --git a/hack/test/e2e-iso.sh b/hack/test/e2e-iso.sh
@@ -15,7 +15,7 @@ function create_cluster {
   "${TALOSCTL}" cluster create \
     --provisioner="${PROVISIONER}" \
     --name="${CLUSTER_NAME}" \
-    --kubernetes-version=${K8S_VERSION} \
+    --kubernetes-version=${KUBERNETES_VERSION} \
     --iso-path=${ARTIFACTS}/talos-amd64.iso \
     --masters=1 \
     --workers=0 \

diff --git a/hack/test/e2e-qemu.sh b/hack/test/e2e-qemu.sh
@@ -66,7 +66,7 @@ function create_cluster {
   "${TALOSCTL}" cluster create \
     --provisioner="${PROVISIONER}" \
     --name="${CLUSTER_NAME}" \
-    --kubernetes-version=${K8S_VERSION} \
+    --kubernetes-version=${KUBERNETES_VERSION} \
     --masters=3 \
     --workers="${QEMU_WORKERS:-1}" \
     --mtu=1450 \

diff --git a/hack/test/e2e.sh b/hack/test/e2e.sh
@@ -14,7 +14,7 @@
 #  - IMAGE
 #  - INSTALLER_IMAGE
 #
-# Some environment variables set in this file (e. g. TALOS_VERSION and K8S_VERSION)
+# Some environment variables set in this file (e. g. TALOS_VERSION and KUBERNETES_VERSION)
 # are referenced by https://github.com/talos-systems/cluster-api-templates.
 # See other e2e-*.sh scripts.
 
@@ -26,12 +26,12 @@ mkdir -p "${TMP}"
 # Talos
 
 export TALOSCONFIG="${TMP}/talosconfig"
-export TALOS_VERSION=v0.11
+export TALOS_VERSION=v0.13
 
 # Kubernetes
 
 export KUBECONFIG="${TMP}/kubeconfig"
-export K8S_VERSION=${K8S_VERSION:-1.22.2}
+export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.22.2}
 
 # Sonobuoy