Merge pull request #55 from HideyoshiSolutions/staging

Staging - Better Instance Type Config

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
 }

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
 }

instances/instance.tf

@@ -71,8 +71,8 @@ resource "aws_security_group" "project_pool" {
 }
 
 resource "aws_instance" "main" {
-  ami                    = "ami-0af6e9042ea5a4e3e"
+  ami                    = var.aws_ami
-  instance_type          = "t3a.small"
+  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,10 +110,19 @@ resource "aws_instance" "main" {
 }
 
 resource "aws_instance" "worker" {
-  ami                    = "ami-0af6e9042ea5a4e3e"
+  ami                    = var.aws_ami
-  instance_type          = "t3a.small"
+  instance_type          = var.aws_instance_type
   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
 

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}"

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" {