From 629aa44ef4ce00b1e345dbca8e40d0d7c38e4cf8 Mon Sep 17 00:00:00 2001
From: Charles Kenney <charlesc.kenney@gmail.com>
Date: Wed, 20 Jan 2021 16:12:46 -0500
Subject: [PATCH] update e2e terraform

---
 e2e/Makefile                       |  2 +-
 e2e/test/scripts/create_cluster.sh | 30 ++++++++----------------------
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/e2e/Makefile b/e2e/Makefile
index da32ca6a..d191fdcb 100644
--- a/e2e/Makefile
+++ b/e2e/Makefile
@@ -37,4 +37,4 @@ install-terraform:
 	sudo mv terraform /usr/local/bin/
 
 control-plane-ssh: $(REUSED_KUBECONFIG)
-	ssh core@$(CONTROL_PLANE_IP)
+	ssh root@$(CONTROL_PLANE_IP)
diff --git a/e2e/test/scripts/create_cluster.sh b/e2e/test/scripts/create_cluster.sh
index 5ad01a26..1decc36e 100755
--- a/e2e/test/scripts/create_cluster.sh
+++ b/e2e/test/scripts/create_cluster.sh
@@ -10,32 +10,18 @@ export IMAGE="$3"
 
 
 cat > cluster.tf <<EOF
-variable "server_type_node" {
-  default = "g6-standard-2"
-}
 variable "nodes" {
   default = 2
 }
-variable "server_type_master" {
-  default = "g6-standard-2"
-}
-variable "region" {
-  default = "eu-west"
-}
-variable "ssh_public_key" {
-  default = "${HOME}/.ssh/id_rsa.pub"
-}
+
 module "k8s" {
-  source  = "git::https://github.com/linode/terraform-linode-k8s.git?ref=for-cli"
-  k8s_version = "v1.13.5"
+  source       = "git::https://github.com/linode/terraform-linode-k8s.git"
+  k8s_version  = "v1.18.13"
   linode_token = "${LINODE_API_TOKEN}"
-  linode_group = "${CLUSTER_NAME}"
-  ccm_image = "${IMAGE}"
-  server_type_node = "\${var.server_type_node}"
-  nodes = "\${var.nodes}"
-  server_type_master = "\${var.server_type_master}"
-  region = "\${var.region}"
-  ssh_public_key = "\${var.ssh_public_key}"
+  ccm_image    = "${IMAGE}"
+  region       = "eu-west"
+  cluster_name = "${CLUSTER_NAME}"
+  nodes        = var.nodes
 }
 EOF
 
@@ -45,4 +31,4 @@ terraform init
 
 terraform apply -auto-approve
 
-export KUBECONFIG="$(pwd)/${CLUSTER_NAME}.conf"
\ No newline at end of file
+export KUBECONFIG="$(pwd)/${CLUSTER_NAME}.conf"