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

test: update capi templates to v1beta1

Browse Source 
This PR uplifts our E2E tests to use the latest CAPI templates and
providers

Signed-off-by: Spencer Smith <spencer.smith@talos-systems.com>
This commit is contained in:
Spencer Smith 2021-12-10 11:31:15 -05:00
parent 936b4c4cee
commit 3af56bd2e7
No known key found for this signature in database
GPG Key ID: 036C4E711644C223
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -27,7 +27,7 @@ TALOSCTL_DEFAULT_TARGET := talosctl-$(OPERATING_SYSTEM)
INTEGRATION_TEST_DEFAULT_TARGET := integration-test-$(OPERATING_SYSTEM)
INTEGRATION_TEST_PROVISION_DEFAULT_TARGET := integration-test-provision-$(OPERATING_SYSTEM)
KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/release/v1.23.0/bin/$(OPERATING_SYSTEM)/amd64/kubectl
CLUSTERCTL_VERSION ?= 0.4.3
CLUSTERCTL_VERSION ?= 1.0.2
CLUSTERCTL_URL ?= https://github.com/kubernetes-sigs/cluster-api/releases/download/v$(CLUSTERCTL_VERSION)/clusterctl-$(OPERATING_SYSTEM)-amd64
TESTPKGS ?= github.com/talos-systems/talos/...
RELEASES ?= v0.13.4 v0.14.0-alpha.2

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

@ -57,6 +57,7 @@ function setup {
export AWS_SSH_KEY_NAME=talos-e2e
export AWS_VPC_ID=vpc-ff5c5687
export AWS_SUBNET=subnet-c4e9b3a0
export AWS_SUBNET_AZ=us-east-1a
export CALICO_VERSION=v3.18
export AWS_CLOUD_PROVIDER_VERSION=v1.20.0-alpha.0
@ -76,9 +77,9 @@ function setup {
export AWS_NODE_ADDL_SEC_GROUPS='[{id: sg-ebe8e59f}]'
export AWS_NODE_IAM_PROFILE=CAPI_AWS_Worker
${CLUSTERCTL} config cluster ${NAME_PREFIX} \
${CLUSTERCTL} generate cluster ${NAME_PREFIX} \
--kubeconfig /tmp/e2e/docker/kubeconfig \
--from https://github.com/talos-systems/cluster-api-templates/blob/v1alpha4/aws/standard/standard.yaml > ${TMP}/cluster.yaml
--from https://github.com/talos-systems/cluster-api-templates/blob/v1beta1/aws/standard/standard.yaml > ${TMP}/cluster.yaml
}
setup

10
hack/test/e2e-capi.sh
View File

@ -4,11 +4,11 @@ set -eou pipefail
source ./hack/test/e2e.sh
export CAPI_VERSION="${CAPI_VERSION:-0.4.4}"
export CABPT_VERSION="${CABPT_VERSION:-0.4.2}"
export CACPPT_VERSION="${CACPPT_VERSION:-0.3.1}"
export CAPA_VERSION="${CAPA_VERSION:-0.7.2}"
export CAPG_VERSION="${CAPG_VERSION:-0.4.0}"
export CAPI_VERSION="${CAPI_VERSION:-1.0.2}"
export CABPT_VERSION="${CABPT_VERSION:-0.5.0}"
export CACPPT_VERSION="${CACPPT_VERSION:-0.4.0}"
export CAPA_VERSION="${CAPA_VERSION:-1.1.0}"
export CAPG_VERSION="${CAPG_VERSION:-1.0.0}"
# We need to override this here since e2e.sh will set it to ${TMP}/capi/kubeconfig.
export KUBECONFIG="/tmp/e2e/docker/kubeconfig"

5
hack/test/e2e-gcp.sh
View File

@ -34,10 +34,9 @@ function setup {
export GCP_NODE_VOL_SIZE=50
export GCP_NODE_IMAGE_ID=projects/${GCP_PROJECT}/global/images/talos-e2e-${SHA}
## TODO: update to talos-systems once merged
${CLUSTERCTL} config cluster ${NAME_PREFIX} \
${CLUSTERCTL} generate cluster ${NAME_PREFIX} \
--kubeconfig /tmp/e2e/docker/kubeconfig \
--from https://github.com/talos-systems/cluster-api-templates/blob/v1alpha4/gcp/standard/standard.yaml > ${TMP}/cluster.yaml
--from https://github.com/talos-systems/cluster-api-templates/blob/v1beta1/gcp/standard/standard.yaml > ${TMP}/cluster.yaml
}