alt-orchestra/talos
1
0
Fork 0
Code Issues Pull Requests Actions 27 Packages Projects Releases Wiki Activity

test: update vars for AWS cluster

Browse Source 
This PR updates to use the newest var setup from our capi templates.

Signed-off-by: Spencer Smith <spencer.smith@talos-systems.com>
This commit is contained in:
Spencer Smith 2021-10-19 14:30:58 -04:00
parent ad23891b1f
commit c8e404e356
No known key found for this signature in database
GPG Key ID: 036C4E711644C223
5 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
hack/test/e2e-aws.sh
View File

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

2
hack/test/e2e-docker.sh
View File

@ -13,7 +13,7 @@ function create_cluster {
"${TALOSCTL}" cluster create \ "${TALOSCTL}" cluster create \
--provisioner="${PROVISIONER}" \ --provisioner="${PROVISIONER}" \
--name="${CLUSTER_NAME}" \ --name="${CLUSTER_NAME}" \
--kubernetes-version=${K8S_VERSION} \ --kubernetes-version=${KUBERNETES_VERSION} \
--image="${IMAGE}" \ --image="${IMAGE}" \
--masters=1 \ --masters=1 \
--workers=1 \ --workers=1 \

2
hack/test/e2e-iso.sh
View File

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

2
hack/test/e2e-qemu.sh
View File

@ -78,7 +78,7 @@ function create_cluster {
"${TALOSCTL}" cluster create \ "${TALOSCTL}" cluster create \
--provisioner="${PROVISIONER}" \ --provisioner="${PROVISIONER}" \
--name="${CLUSTER_NAME}" \ --name="${CLUSTER_NAME}" \
--kubernetes-version=${K8S_VERSION} \ --kubernetes-version=${KUBERNETES_VERSION} \
--masters=3 \ --masters=3 \
--workers="${QEMU_WORKERS:-1}" \ --workers="${QEMU_WORKERS:-1}" \
--mtu=1450 \ --mtu=1450 \

6
hack/test/e2e.sh
View File

@ -13,7 +13,7 @@
# - IMAGE # - IMAGE
# - INSTALLER_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. # are referenced by https://github.com/talos-systems/cluster-api-templates.
# See other e2e-*.sh scripts. # See other e2e-*.sh scripts.
@ -25,12 +25,12 @@ mkdir -p "${TMP}"
# Talos # Talos
export TALOSCONFIG="${TMP}/talosconfig" export TALOSCONFIG="${TMP}/talosconfig"
export TALOS_VERSION=v0.11 export TALOS_VERSION=v0.14
# Kubernetes # Kubernetes
export KUBECONFIG="${TMP}/kubeconfig" export KUBECONFIG="${TMP}/kubeconfig"
export K8S_VERSION=${K8S_VERSION:-1.22.2} export KUBERNETES_VERSION=${KUBERNETES_VERSION:-1.22.2}
export NAME_PREFIX="talos-e2e-${SHA}-${PLATFORM}" export NAME_PREFIX="talos-e2e-${SHA}-${PLATFORM}"
export TIMEOUT=1200 export TIMEOUT=1200