old-portfolio/terraform-hideyoshi.com
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #35 from HideyoshiSolutions/staging

Browse Source 
Staging - Fixes Setup Script and Upgrades EC2 Instances
This commit is contained in:
Vitor Hideyoshi
2024-02-14 02:21:13 -03:00
committed by GitHub
parent 26a86b2bfc 9030936fdc
commit 38ad5eb349
1 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
instances/instance.tf
View File

@@ -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"
@@ -96,13 +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 '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",
]
}
@@ -113,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
@@ -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"
@@ -138,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",
]
}