From 52f193a99fa440d8bbbd45021c055ba1b29dd61f Mon Sep 17 00:00:00 2001
From: Vitor Hideyoshi Nakazone Batista <vitor.h.n.batista@gmail.com>
Date: Thu, 29 Aug 2024 04:55:41 -0300
Subject: [PATCH 1/3] Updates EC2 to Spot Instances

---
 instances/instance.tf | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/instances/instance.tf b/instances/instance.tf
index 0f6d23a..bc62e0e 100644
--- a/instances/instance.tf
+++ b/instances/instance.tf
@@ -71,8 +71,8 @@ resource "aws_security_group" "project_pool" {
 }
 
 resource "aws_instance" "main" {
-  ami                    = "ami-0af6e9042ea5a4e3e"
-  instance_type          = "t3a.small"
+  ami                    = "ami-06a17a87e19be286a"
+  instance_type          = "t4g.micro"
   vpc_security_group_ids = [aws_security_group.project_pool.id]
 
   key_name = aws_key_pair.ssh_key_main.key_name
@@ -110,10 +110,19 @@ resource "aws_instance" "main" {
 }
 
 resource "aws_instance" "worker" {
-  ami                    = "ami-0af6e9042ea5a4e3e"
-  instance_type          = "t3a.small"
+  ami                    = "ami-06a17a87e19be286a"
+  instance_type          = "t4g.micro"
   vpc_security_group_ids = [aws_security_group.project_pool.id]
   count                  = var.number_of_workers
+  
+  instance_market_options {
+    market_type = "spot"
+    spot_options {
+      max_price = 0.0014
+      instance_interruption_behavior = "stop"
+      spot_instance_type = "persistent"
+    }
+  }
 
   key_name = aws_key_pair.ssh_key_main.key_name
 

From bfce11aa094a4e9cb0e4db47783ec20248425ca7 Mon Sep 17 00:00:00 2001
From: Vitor Hideyoshi <vitor.h.n.batista@gmail.com>
Date: Sun, 1 Sep 2024 15:01:15 -0300
Subject: [PATCH 2/3] Better Instance Type Config

---
 config.tf             | 10 ++++++++++
 instances/config.tf   | 10 ++++++++++
 instances/instance.tf |  8 ++++----
 main.tf               |  2 ++
 4 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/config.tf b/config.tf
index d0f09c3..a99b7b6 100644
--- a/config.tf
+++ b/config.tf
@@ -35,6 +35,16 @@ variable "aws_secret" {
     type = string
 }
 
+variable "aws_instance_type" {
+    type = string
+    default = "t4g.micro"
+}
+
+variable "aws_ami" {
+    type = string
+    default = "ami-06a17a87e19be286a"
+}
+
 variable "cloudflare_api_token" {
     type = string
 }
diff --git a/instances/config.tf b/instances/config.tf
index c35e4fb..0a4d8a3 100644
--- a/instances/config.tf
+++ b/instances/config.tf
@@ -23,6 +23,16 @@ variable "aws_region" {
     default = "sa-east-1"
 }
 
+variable "aws_instance_type" {
+    type = string
+    default = "t4g.micro"
+}
+
+variable "aws_ami" {
+    type = string
+    default = "ami-06a17a87e19be286a"
+}
+
 variable "ssh_public_key_main" {
     type = string
 }
diff --git a/instances/instance.tf b/instances/instance.tf
index bc62e0e..b891f06 100644
--- a/instances/instance.tf
+++ b/instances/instance.tf
@@ -71,8 +71,8 @@ resource "aws_security_group" "project_pool" {
 }
 
 resource "aws_instance" "main" {
-  ami                    = "ami-06a17a87e19be286a"
-  instance_type          = "t4g.micro"
+  ami                    = var.aws_ami
+  instance_type          = var.aws_instance_type
   vpc_security_group_ids = [aws_security_group.project_pool.id]
 
   key_name = aws_key_pair.ssh_key_main.key_name
@@ -110,8 +110,8 @@ resource "aws_instance" "main" {
 }
 
 resource "aws_instance" "worker" {
-  ami                    = "ami-06a17a87e19be286a"
-  instance_type          = "t4g.micro"
+  ami                    = var.aws_ami
+  instance_type          = var.aws_instance_type
   vpc_security_group_ids = [aws_security_group.project_pool.id]
   count                  = var.number_of_workers
   
diff --git a/main.tf b/main.tf
index 4c0ca08..3001cb1 100644
--- a/main.tf
+++ b/main.tf
@@ -55,6 +55,8 @@ module "instances" {
   aws_region           = var.aws_region
   ssh_public_key_main  = var.ssh_public_key_main
   ssh_public_key_ci_cd = var.ssh_public_key_ci_cd
+  aws_instance_type    = var.aws_instance_type
+  aws_ami              = var.aws_ami
 }
 
 module "dns" {

From 7e5989a8139f65eeeda69fcdc50035613f418a8d Mon Sep 17 00:00:00 2001
From: Vitor Hideyoshi <vitor.h.n.batista@gmail.com>
Date: Mon, 2 Sep 2024 00:16:52 -0300
Subject: [PATCH 3/3] Fixes KubeConfig Mode

---
 kubernetes/kubernetes.tf | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kubernetes/kubernetes.tf b/kubernetes/kubernetes.tf
index 0e2dead..955d6ea 100644
--- a/kubernetes/kubernetes.tf
+++ b/kubernetes/kubernetes.tf
@@ -30,6 +30,7 @@ resource "yoshik3s_master_node" "master_node" {
   }
 
   node_options = [
+    "--write-kubeconfig-mode 644",
     "--disable traefik",
     "--node-label node_type=master",
     "--tls-san ${var.cluster_domain}"