test: update templates to v1beta1

This PR lets us test with the v1beta1 templates. Signed-off-by: Spencer Smith <spencer.smith@talos-systems.com> (cherry picked from commit 65043b7)
siderolabs · Dec 10, 2021 · 77b0bba · 77b0bba
1 parent a5af5e4
commit 77b0bba
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/hack/test/e2e-aws.sh b/hack/test/e2e-aws.sh
@@ -2,7 +2,7 @@
 
 set -eou pipefail
 
-TMP="/tmp/cacppt-e2e/"
+TMP="/tmp/cacppt-e2e"
 mkdir -p "${TMP}"
 
 AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID:-}
@@ -27,7 +27,7 @@ K8S_VERSION="${K8S_VERSION:-v1.22.3}"
 KUBECONFIG=
 AMI=${AWS_AMI:-$(curl -sL https://github.com/talos-systems/talos/releases/download/${TALOS_VERSION}/cloud-images.json | \
     jq -r --arg REGION "${REGION}" '.[] | select(.region == $REGION) | select (.arch == "amd64") | .id')}
-export PROVIDER=aws:v1.0.0
+export PROVIDER=aws:v1.1.0
 
 CREATED_CLUSTER=""
 TALOSCTL_PATH="${TMP}/talosctl"
@@ -135,6 +135,7 @@ function aws_setup {
   export AWS_SSH_KEY_NAME=${AWS_SSH_KEY_NAME:-talos-e2e}
   export AWS_VPC_ID=${AWS_VPC_ID:-vpc-ff5c5687}
   export AWS_SUBNET=${AWS_SUBNET:-subnet-c4e9b3a0}
+  export AWS_SUBNET_AZ=${AWS_SUBNET_AZ:-us-east-1a}
 
   ## Control plane vars
   export AWS_CONTROL_PLANE_AMI_ID=${AMI}

diff --git a/internal/integration/integration_test.go b/internal/integration/integration_test.go
@@ -71,7 +71,7 @@ func (suite *IntegrationSuite) SetupSuite() {
 		return def
 	}
 
-	providerType := env("PROVIDER", "aws:v1.0.0")
+	providerType := env("PROVIDER", "aws:v1.1.0")
 
 	provider, err := infrastructure.NewProvider(providerType)
 	suite.Require().NoError(err)
@@ -124,8 +124,8 @@ func (suite *IntegrationSuite) SetupSuite() {
 	}
 
 	options := capi.Options{
-		CoreProvider:            env("CORE_PROVIDER", "cluster-api:v1.0.0"),
-		BootstrapProviders:      []string{"talos:v0.5.0-alpha.0"},
+		CoreProvider:            env("CORE_PROVIDER", "cluster-api:v1.0.2"),
+		BootstrapProviders:      []string{"talos:v0.5.0"},
 		InfrastructureProviders: []infrastructure.Provider{provider},
 		ControlPlaneProviders:   []string{"talos"},
 		WaitProviderTimeout:     time.Minute,
@@ -150,7 +150,7 @@ func (suite *IntegrationSuite) SetupSuite() {
 	cluster, err := manager.DeployCluster(suite.ctx, fmt.Sprintf("caccpt-test-cluster-%s", id.String()[:7]),
 		capi.WithProvider(provider.Name()),
 		capi.WithKubernetesVersion(strings.TrimLeft(env("WORKLOAD_KUBERNETES_VERSION", env("K8S_VERSION", "v1.22.2")), "v")),
-		capi.WithTemplateFile("https://github.com/Unix4ever/cluster-api-templates/blob/drop-init-configs/aws/standard/standard.yaml"),
+		capi.WithTemplateFile("https://github.com/talos-systems/cluster-api-templates/blob/v1beta1/aws/standard/standard.yaml"),
 	)
 	suite.Require().NoError(err)