Skip to content

Commit 629aa44

Browse files
committed
update e2e terraform
1 parent ed2bfb8 commit 629aa44

File tree

2 files changed

+9
-23
lines changed

2 files changed

+9
-23
lines changed

e2e/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,4 +37,4 @@ install-terraform:
3737
sudo mv terraform /usr/local/bin/
3838

3939
control-plane-ssh: $(REUSED_KUBECONFIG)
40-
ssh core@$(CONTROL_PLANE_IP)
40+
ssh root@$(CONTROL_PLANE_IP)

e2e/test/scripts/create_cluster.sh

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -10,32 +10,18 @@ export IMAGE="$3"
1010

1111

1212
cat > cluster.tf <<EOF
13-
variable "server_type_node" {
14-
default = "g6-standard-2"
15-
}
1613
variable "nodes" {
1714
default = 2
1815
}
19-
variable "server_type_master" {
20-
default = "g6-standard-2"
21-
}
22-
variable "region" {
23-
default = "eu-west"
24-
}
25-
variable "ssh_public_key" {
26-
default = "${HOME}/.ssh/id_rsa.pub"
27-
}
16+
2817
module "k8s" {
29-
source = "git::https://github.com/linode/terraform-linode-k8s.git?ref=for-cli"
30-
k8s_version = "v1.13.5"
18+
source = "git::https://github.com/linode/terraform-linode-k8s.git"
19+
k8s_version = "v1.18.13"
3120
linode_token = "${LINODE_API_TOKEN}"
32-
linode_group = "${CLUSTER_NAME}"
33-
ccm_image = "${IMAGE}"
34-
server_type_node = "\${var.server_type_node}"
35-
nodes = "\${var.nodes}"
36-
server_type_master = "\${var.server_type_master}"
37-
region = "\${var.region}"
38-
ssh_public_key = "\${var.ssh_public_key}"
21+
ccm_image = "${IMAGE}"
22+
region = "eu-west"
23+
cluster_name = "${CLUSTER_NAME}"
24+
nodes = var.nodes
3925
}
4026
EOF
4127

@@ -45,4 +31,4 @@ terraform init
4531

4632
terraform apply -auto-approve
4733

48-
export KUBECONFIG="$(pwd)/${CLUSTER_NAME}.conf"
34+
export KUBECONFIG="$(pwd)/${CLUSTER_NAME}.conf"

0 commit comments

Comments
 (0)