From af0cc70e3775cf7017387c541273a2580c55c78c Mon Sep 17 00:00:00 2001 From: Spencer Smith Date: Wed, 23 Aug 2023 12:28:19 -0400 Subject: [PATCH] test: update e2e-aws to use worker groups This PR updates the e2e-aws flow to use worker groups and an updated control plane variable setup. Signed-off-by: Spencer Smith --- hack/test/tfvars/aws.jq | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/hack/test/tfvars/aws.jq b/hack/test/tfvars/aws.jq index 4c3c63756..5f9df9f6c 100644 --- a/hack/test/tfvars/aws.jq +++ b/hack/test/tfvars/aws.jq @@ -1,16 +1,10 @@ { "cluster_name": .cluster_name, - "num_control_planes": 3, - "num_workers": (if .worker_group == "nvidia" then 0 else 3 end), - "ami_id": .ami_id, "ccm": true, "kubernetes_version": .kubernetes_version, - "instance_type_control_plane": "t3.large", - "instance_type_worker": "t3.large", - "extra_tags": { - "Name": .cluster_name, - "Project": "talos-e2e-ci", - "Environment": "ci" + "control_plane": { + "ami_id": .ami_id, + "instance_type": "t3.large" }, "worker_groups": (if .worker_group == "nvidia" then [ { @@ -24,5 +18,18 @@ "Type": "nvidia-t4" } } - ] else [] end) + ] else [ + { + "name": "default", + "num_instances": 3, + "ami_id": .ami_id, + "instance_type": "t3.large" + } + ] end), + "extra_tags": { + "Cluster Name": .cluster_name, + "Project": "talos-e2e-ci", + "Environment": "ci" + }, + }