From f6eab491d8c591d5d1cadf0a5bcc774452fcc91e Mon Sep 17 00:00:00 2001 From: Vitor Hideyoshi Nakazone Batista Date: Thu, 15 Feb 2024 00:23:00 -0300 Subject: [PATCH 1/3] Fixes Kubernetes Configuration and Adds 2Gb of Ram --- instances/instance.tf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/instances/instance.tf b/instances/instance.tf index a9850b1..b8e17bd 100644 --- a/instances/instance.tf +++ b/instances/instance.tf @@ -106,6 +106,7 @@ resource "aws_instance" "main" { "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 'chmod g+r $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", @@ -119,7 +120,7 @@ resource "aws_instance" "main" { resource "aws_instance" "worker" { ami = "ami-0af6e9042ea5a4e3e" - instance_type = "t3a.micro" + instance_type = "t3a.small" vpc_security_group_ids = [aws_security_group.project_pool.id] count = var.number_of_workers From 9e50a1ff516a790a6a12986bc17c9496c6b15c25 Mon Sep 17 00:00:00 2001 From: Vitor Hideyoshi Nakazone Batista Date: Thu, 15 Feb 2024 22:58:44 -0300 Subject: [PATCH 2/3] Increases Cluster RAM --- instances/instance.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/instances/instance.tf b/instances/instance.tf index b8e17bd..0aa052c 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 = "t3a.micro" + instance_type = "t3a.small" vpc_security_group_ids = [aws_security_group.project_pool.id] key_name = aws_key_pair.ssh_key_main.key_name From 26abb355d4db587f7c83c75e663681262558d9c6 Mon Sep 17 00:00:00 2001 From: Vitor Hideyoshi Nakazone Batista Date: Sat, 17 Feb 2024 01:52:58 -0300 Subject: [PATCH 3/3] Label Nodes --- instances/instance.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/instances/instance.tf b/instances/instance.tf index 0aa052c..a4cf617 100644 --- a/instances/instance.tf +++ b/instances/instance.tf @@ -101,7 +101,7 @@ 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/setup.sh", + "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} --node-label=`kubernetes.io/role=master`\" 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", @@ -150,7 +150,7 @@ 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/setup.sh", + "echo 'curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC=\"agent --node-label=`kubernetes.io/role=worker`\" 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/setup.sh | tee logs.txt",