Skip to content

Commit 2258bc4

Browse files
committed
test: update GCP e2e script to work with new templates
This PR updates the e2e scripts to work properly by updating the var names as needed. Signed-off-by: Spencer Smith <spencer.smith@talos-systems.com>
1 parent 36b6ace commit 2258bc4

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

hack/test/e2e-gcp.sh

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,26 +16,26 @@ function setup {
1616

1717
## Cluster-wide vars
1818
export CLUSTER_NAME=${NAME_PREFIX}
19-
export PROJECT=talos-testbed
20-
export REGION=us-central1
21-
export NETWORK=default
19+
export GCP_PROJECT=talos-testbed
20+
export GCP_REGION=us-central1
21+
export GCP_NETWORK=default
2222

2323
## Control plane vars
24-
export CP_COUNT=3
25-
export CP_INSTANCE_TYPE=n1-standard-4
26-
export CP_VOL_SIZE=50
27-
export CP_IMAGE_ID=projects/${PROJECT}/global/images/talos-e2e-${SHA}
24+
export CONTROL_PLANE_MACHINE_COUNT=3
25+
export GCP_CONTROL_PLANE_MACHINE_TYPE=n1-standard-4
26+
export GCP_CONTROL_PLANE_VOL_SIZE=50
27+
export GCP_CONTROL_PLANE_IMAGE_ID=projects/${GCP_PROJECT}/global/images/talos-e2e-${SHA}
2828

2929
## Worker vars
30-
export WORKER_COUNT=3
31-
export WORKER_INSTANCE_TYPE=n1-standard-4
32-
export WORKER_VOL_SIZE=50
33-
export WORKER_IMAGE_ID=projects/${PROJECT}/global/images/talos-e2e-${SHA}
30+
export WORKER_MACHINE_COUNT=3
31+
export GCP_NODE_MACHINE_TYPE=n1-standard-4
32+
export GCP_NODE_VOL_SIZE=50
33+
export GCP_NODE_IMAGE_ID=projects/${GCP_PROJECT}/global/images/talos-e2e-${SHA}
3434

3535
## TODO: update to talos-systems once merged
3636
${CLUSTERCTL} config cluster ${NAME_PREFIX} \
3737
--kubeconfig /tmp/e2e/docker/kubeconfig \
38-
--from https://github.com/rsmitty/cluster-api-templates/blob/main/gcp/standard/standard.yaml > ${TMP}/cluster.yaml
38+
--from https://github.com/talos-systems/cluster-api-templates/blob/main/gcp/standard/standard.yaml > ${TMP}/cluster.yaml
3939

4040
}
4141

0 commit comments

Comments
 (0)