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

Merge pull request #28 from HideyoshiNakazone/k3s-tls-certificate

Browse Source 
Fixes Domain Formating
This commit is contained in:
Vitor Hideyoshi
2024-02-08 23:01:44 -03:00
committed by GitHub
parent 5ae5edaaec 3e0d294b8a
commit fb7fbbe617
2 changed files with 133 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bucket/bucket.tf
View File

@@ -3,7 +3,7 @@ terraform {
aws = { aws = {
source = "hashicorp/aws" source = "hashicorp/aws"
version = "5.17.0" version = "5.17.0"
configuration_aliases = [ aws.main ] configuration_aliases = [aws.main]
} }
} }
} }
@@ -74,6 +74,6 @@ resource "aws_s3_bucket_cors_configuration" "default" {
cors_rule { cors_rule {
allowed_headers = ["*"] allowed_headers = ["*"]
allowed_methods = ["GET", "PUT", "POST", "DELETE", "HEAD"] allowed_methods = ["GET", "PUT", "POST", "DELETE", "HEAD"]
allowed_origins = ["${var.project_domain}"] allowed_origins = ["https://${var.project_domain}"]
} }
} }

12
instances/instance.tf
View File

@@ -3,7 +3,7 @@ terraform {
aws = { aws = {
source = "hashicorp/aws" source = "hashicorp/aws"
version = "5.17.0" version = "5.17.0"
configuration_aliases = [ aws.main ] configuration_aliases = [aws.main]
} }
tls = { tls = {
source = "hashicorp/tls" source = "hashicorp/tls"
@@ -41,7 +41,7 @@ locals {
# { "port": 6080, "protocol": "tcp" }, # { "port": 6080, "protocol": "tcp" },
# { "port": 6443, "protocol": "tcp" }, # { "port": 6443, "protocol": "tcp" },
# { "port": 10250, "protocol": "tcp" }, # { "port": 10250, "protocol": "tcp" },
{ "port": 0, "protocol": "-1" }, { "port" : 0, "protocol" : "-1" },
] ]
} }
@@ -73,7 +73,7 @@ resource "aws_security_group" "project_pool" {
resource "aws_instance" "main" { resource "aws_instance" "main" {
ami = "ami-0af6e9042ea5a4e3e" ami = "ami-0af6e9042ea5a4e3e"
instance_type = "t2.micro" instance_type = "t2.micro"
vpc_security_group_ids = [ aws_security_group.project_pool.id ] vpc_security_group_ids = [aws_security_group.project_pool.id]
key_name = aws_key_pair.ssh_key_main.key_name key_name = aws_key_pair.ssh_key_main.key_name
@@ -114,7 +114,7 @@ resource "aws_instance" "main" {
resource "aws_instance" "worker" { resource "aws_instance" "worker" {
ami = "ami-0af6e9042ea5a4e3e" ami = "ami-0af6e9042ea5a4e3e"
instance_type = "t2.micro" instance_type = "t2.micro"
vpc_security_group_ids = [ aws_security_group.project_pool.id ] vpc_security_group_ids = [aws_security_group.project_pool.id]
count = var.number_of_workers count = var.number_of_workers
key_name = aws_key_pair.ssh_key_main.key_name key_name = aws_key_pair.ssh_key_main.key_name
@@ -138,7 +138,7 @@ resource "aws_instance" "worker" {
"sudo /sbin/mkswap /var/swap.1", "sudo /sbin/mkswap /var/swap.1",
"sudo chmod 600 /var/swap.1", "sudo chmod 600 /var/swap.1",
"sudo /sbin/swapon /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=\"${var.project_domain}:6443\" sh -s -' >> /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/ubuntu/setup.sh",
"chmod +x /home/ubuntu/setup.sh", "chmod +x /home/ubuntu/setup.sh",
"while ! nc -z ${aws_instance.main.public_ip} 6443; do sleep 0.1; done", "while ! nc -z ${aws_instance.main.public_ip} 6443; do sleep 0.1; done",
"exec /home/ubuntu/setup.sh | tee logs.txt", "exec /home/ubuntu/setup.sh | tee logs.txt",
@@ -146,7 +146,7 @@ resource "aws_instance" "worker" {
} }
tags = { tags = {
Name = "${var.project_name}-worker-${count.index+1}" Name = "${var.project_name}-worker-${count.index + 1}"
} }
} }