From e89c6ad4123fff5fa10bbefac18dd3c6034d1342 Mon Sep 17 00:00:00 2001 From: Vitor Hideyoshi Nakazone Batista Date: Tue, 13 Feb 2024 19:53:31 -0300 Subject: [PATCH 1/3] Adds Helm to Cluster and Upgrades Volumes --- instances/instance.tf | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/instances/instance.tf b/instances/instance.tf index bfe53fa..9298e39 100644 --- a/instances/instance.tf +++ b/instances/instance.tf @@ -72,7 +72,7 @@ resource "aws_security_group" "project_pool" { resource "aws_instance" "main" { ami = "ami-0af6e9042ea5a4e3e" - instance_type = "t2.micro" + instance_type = "t3a.micro" vpc_security_group_ids = [aws_security_group.project_pool.id] key_name = aws_key_pair.ssh_key_main.key_name @@ -82,6 +82,11 @@ resource "aws_instance" "main" { terraform_key = tls_private_key.terraform_ssh_key.public_key_openssh }) + root_block_device { + volume_size = 15 + volume_type = "gp3" + } + provisioner "remote-exec" { connection { type = "ssh" @@ -97,6 +102,7 @@ resource "aws_instance" "main" { "sudo chmod 600 /var/swap.1", "sudo /sbin/swapon /var/swap.1", "echo 'curl -sfL https://get.k3s.io | K3S_TOKEN=\"${var.k3s_token}\" K3S_KUBECONFIG_MODE=644 INSTALL_K3S_EXEC=\"server --disable=traefik --tls-san=${var.project_domain}\" sh -' >> /home/ubuntu/setup.sh", + "echo 'curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash' >> /home/ubuntu/setup.sh", "echo 'mkdir /home/ubuntu/.kube' >> /home/ubuntu/setup.sh", "echo 'sudo chmod 644 /etc/rancher/k3s/k3s.yaml' >> /home/ubuntu/setup.sh", "echo 'cp /etc/rancher/k3s/k3s.yaml /home/ubuntu/.kube/k3s.yaml' >> /home/ubuntu/setup.sh", @@ -124,6 +130,11 @@ resource "aws_instance" "worker" { terraform_key = tls_private_key.terraform_ssh_key.public_key_openssh }) + root_block_device { + volume_size = 15 + volume_type = "gp3" + } + provisioner "remote-exec" { connection { type = "ssh" From efd000f2a547b37e8ca934d96d3e555eb3d36334 Mon Sep 17 00:00:00 2001 From: Vitor Hideyoshi Nakazone Batista Date: Tue, 13 Feb 2024 23:15:13 -0300 Subject: [PATCH 2/3] Upgrades Worker Instances --- instances/instance.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instances/instance.tf b/instances/instance.tf index 9298e39..8a00aa8 100644 --- a/instances/instance.tf +++ b/instances/instance.tf @@ -119,7 +119,7 @@ resource "aws_instance" "main" { resource "aws_instance" "worker" { ami = "ami-0af6e9042ea5a4e3e" - instance_type = "t2.micro" + instance_type = "t3a.micro" vpc_security_group_ids = [aws_security_group.project_pool.id] count = var.number_of_workers From 4cf98364ec3b9a216494991b5669d423ae6e7c6f Mon Sep 17 00:00:00 2001 From: Vitor Hideyoshi Nakazone Batista Date: Wed, 14 Feb 2024 01:14:49 -0300 Subject: [PATCH 3/3] More Idempotent Setup Script --- instances/instance.tf | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/instances/instance.tf b/instances/instance.tf index 8a00aa8..a9850b1 100644 --- a/instances/instance.tf +++ b/instances/instance.tf @@ -101,14 +101,14 @@ resource "aws_instance" "main" { "sudo /sbin/mkswap /var/swap.1", "sudo chmod 600 /var/swap.1", "sudo /sbin/swapon /var/swap.1", - "echo 'curl -sfL https://get.k3s.io | K3S_TOKEN=\"${var.k3s_token}\" K3S_KUBECONFIG_MODE=644 INSTALL_K3S_EXEC=\"server --disable=traefik --tls-san=${var.project_domain}\" sh -' >> /home/ubuntu/setup.sh", - "echo 'curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash' >> /home/ubuntu/setup.sh", - "echo 'mkdir /home/ubuntu/.kube' >> /home/ubuntu/setup.sh", - "echo 'sudo chmod 644 /etc/rancher/k3s/k3s.yaml' >> /home/ubuntu/setup.sh", - "echo 'cp /etc/rancher/k3s/k3s.yaml /home/ubuntu/.kube/k3s.yaml' >> /home/ubuntu/setup.sh", - "echo 'export KUBECONFIG=/home/ubuntu/.kube/k3s.yaml' >> /home/ubuntu/.profile", - "chmod +x /home/ubuntu/setup.sh", - "exec /home/ubuntu/setup.sh | tee logs.txt", + "echo 'curl -sfL https://get.k3s.io | K3S_TOKEN=\"${var.k3s_token}\" K3S_KUBECONFIG_MODE=644 INSTALL_K3S_EXEC=\"server --disable=traefik --tls-san=${var.project_domain}\" sh -' >> $HOME/setup.sh", + "echo 'curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash' >> $HOME/setup.sh", + "echo 'mkdir -p $HOME/.kube' >> $HOME/setup.sh", + "echo 'sudo chmod 644 /etc/rancher/k3s/k3s.yaml' >> $HOME/setup.sh", + "echo 'cp /etc/rancher/k3s/k3s.yaml $HOME/.kube/k3s.yaml' >> $HOME/setup.sh", + "echo 'export KUBECONFIG=$HOME/.kube/k3s.yaml' >> $HOME/.profile", + "chmod +x $HOME/setup.sh", + "exec $HOME/setup.sh | tee logs.txt", ] } @@ -149,10 +149,10 @@ resource "aws_instance" "worker" { "sudo /sbin/mkswap /var/swap.1", "sudo chmod 600 /var/swap.1", "sudo /sbin/swapon /var/swap.1", - "echo 'curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC=\"agent\" K3S_TOKEN=\"${var.k3s_token}\" K3S_URL=\"https://${var.project_domain}:6443\" sh -s -' >> /home/ubuntu/setup.sh", - "chmod +x /home/ubuntu/setup.sh", + "echo 'curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC=\"agent\" K3S_TOKEN=\"${var.k3s_token}\" K3S_URL=\"https://${var.project_domain}:6443\" sh -s -' >> $HOME/setup.sh", + "chmod +x $HOME/setup.sh", "while ! nc -z ${aws_instance.main.public_ip} 6443; do sleep 0.1; done", - "exec /home/ubuntu/setup.sh | tee logs.txt", + "exec $HOME/setup.sh | tee logs.txt", ] }