Skip to content

Commit

Permalink
Changing the way
Browse files Browse the repository at this point in the history
  • Loading branch information
@LeoDiazL
LeoDiazL committed Dec 20, 2023
1 parent 2c469cd commit 82cbc00
Showing 1 changed file with 112 additions and 112 deletions.
224 changes: 112 additions & 112 deletions operations/deployment/terraform/modules/aws/eks/aws_eks_cluster.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,45 +60,45 @@ data "aws_eks_cluster_auth" "cluster_auth" {
name = aws_eks_cluster.main.id
}

#resource "aws_launch_template" "main" {
# network_interfaces {
# associate_public_ip_address = true
# security_groups = [aws_security_group.eks_security_group_worker.id]
# }
# #vpc_security_group_ids = [aws_security_group.eks_security_group_worker.id]
# #iam_instance_profile {
# # name = aws_iam_instance_profile.eks_inst_profile.name
# #}
# image_id = var.aws_eks_instance_ami_id != "" ? var.aws_eks_instance_ami_id : data.aws_ami.image_selected.id
# instance_type = var.aws_eks_instance_type
# name_prefix = "${var.aws_eks_environment}-eksworker"
# user_data = base64encode(try(file("./aws_ec2_incoming_user_data_script.sh"), (var.aws_eks_instance_ami_id != "" ? local.node-userdata : "" )))
# key_name = var.aws_eks_ec2_key_pair != "" ? var.aws_eks_ec2_key_pair : aws_key_pair.aws_key[0].id
# update_default_version = true
# monitoring {
# enabled = true
# }
# lifecycle {
# create_before_destroy = true
# }
# metadata_options {
# http_endpoint = "enabled"
# http_tokens = "optional"
# http_put_response_hop_limit = 1
# instance_metadata_tags = "enabled"
# }
# #tag_specifications {
# # resource_type = "instance"
# # tags = {
# # # "kubernetes.io/cluster/${var.aws_eks_cluster_name}" = "owned",
# # "Name" = "${var.aws_resource_identifier}-${var.aws_eks_environment}-eksworker-node"
# # }
# #}
# #tags = {
# # "kubernetes.io/cluster/${var.aws_eks_cluster_name}" = "owned"
# #}
# depends_on = [aws_iam_role.iam_role_worker]
#}
resource "aws_launch_template" "main" {
network_interfaces {
associate_public_ip_address = true
security_groups = [aws_security_group.eks_security_group_worker.id]
}
#vpc_security_group_ids = [aws_security_group.eks_security_group_worker.id]
#iam_instance_profile {
# name = aws_iam_instance_profile.eks_inst_profile.name
#}
image_id = var.aws_eks_instance_ami_id != "" ? var.aws_eks_instance_ami_id : data.aws_ami.image_selected.id
instance_type = var.aws_eks_instance_type
name_prefix = "${var.aws_eks_environment}-eksworker"
user_data = base64encode(try(file("./aws_ec2_incoming_user_data_script.sh"), (var.aws_eks_instance_ami_id != "" ? local.node-userdata : "" )))
key_name = var.aws_eks_ec2_key_pair != "" ? var.aws_eks_ec2_key_pair : aws_key_pair.aws_key[0].id
update_default_version = true
monitoring {
enabled = true
}
lifecycle {
create_before_destroy = true
}
metadata_options {
http_endpoint = "enabled"
http_tokens = "optional"
http_put_response_hop_limit = 1
instance_metadata_tags = "enabled"
}
#tag_specifications {
# resource_type = "instance"
# tags = {
# # "kubernetes.io/cluster/${var.aws_eks_cluster_name}" = "owned",
# "Name" = "${var.aws_resource_identifier}-${var.aws_eks_environment}-eksworker-node"
# }
#}
#tags = {
# "kubernetes.io/cluster/${var.aws_eks_cluster_name}" = "owned"
#}
depends_on = [aws_iam_role.iam_role_worker]
}

data "aws_ami" "image_selected" {
most_recent = true
Expand All @@ -111,90 +111,90 @@ data "aws_ami" "image_selected" {
}


#locals {
# #Userdata for nodes
# node-userdata = <<USERDATA
# #!/bin/bash
# set -o xtrace
# # These are used to install SSM Agent to SSH into the EKS nodes.
# sudo yum install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm
# systemctl enable amazon-ssm-agent
# systemctl restart amazon-ssm-agent
# /etc/eks/bootstrap.sh --apiserver-endpoint '${aws_eks_cluster.main.endpoint}' --b64-cluster-ca '${aws_eks_cluster.main.certificate_authority.0.data}' '${aws_eks_cluster.main.name}'
# # Retrieve the necessary packages for `mount` to work properly with NFSv4.1
# sudo yum update -y
# sudo yum install -y amazon-efs-utils nfs-utils nfs-utils-lib
# # after the eks bootstrap and necessary packages installation - restart kubelet
# systemctl restart kubelet.service
# # Take care of instance name by adding the launch order
# INSTANCE_NAME_TAG=$(curl -s http://169.254.169.254/latest/meta-data/tags/instance/Name)
# LOCAL_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
# # Get Instance MetaData
# REGION=$(curl -s http://169.254.169.254/latest/meta-data/placement/region)
# INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id)
# aws ec2 create-tags --region $REGION --resources $INSTANCE_ID --tags Key=Name,Value=$INSTANCE_NAME_TAG-$LOCAL_IP
# USERDATA
#}
locals {
#Userdata for nodes
node-userdata = <<USERDATA
#!/bin/bash
set -o xtrace
# These are used to install SSM Agent to SSH into the EKS nodes.
sudo yum install -y https://s3.amazonaws.com/ec2-downloads-windows/SSMAgent/latest/linux_amd64/amazon-ssm-agent.rpm
systemctl enable amazon-ssm-agent
systemctl restart amazon-ssm-agent
/etc/eks/bootstrap.sh --apiserver-endpoint '${aws_eks_cluster.main.endpoint}' --b64-cluster-ca '${aws_eks_cluster.main.certificate_authority.0.data}' '${aws_eks_cluster.main.name}'
# Retrieve the necessary packages for `mount` to work properly with NFSv4.1
sudo yum update -y
sudo yum install -y amazon-efs-utils nfs-utils nfs-utils-lib
# after the eks bootstrap and necessary packages installation - restart kubelet
systemctl restart kubelet.service
# Take care of instance name by adding the launch order
INSTANCE_NAME_TAG=$(curl -s http://169.254.169.254/latest/meta-data/tags/instance/Name)
LOCAL_IP=$(curl -s http://169.254.169.254/latest/meta-data/local-ipv4)
# Get Instance MetaData
REGION=$(curl -s http://169.254.169.254/latest/meta-data/placement/region)
INSTANCE_ID=$(curl -s http://169.254.169.254/latest/meta-data/instance-id)
aws ec2 create-tags --region $REGION --resources $INSTANCE_ID --tags Key=Name,Value=$INSTANCE_NAME_TAG-$LOCAL_IP
USERDATA
}

resource "aws_autoscaling_group" "main" {
desired_capacity = var.aws_eks_desired_capacity
launch_template {
id = aws_launch_template.main.id
version = "${aws_launch_template.main.latest_version}"
}
max_size = var.aws_eks_max_size
min_size = var.aws_eks_min_size
name = "${var.aws_resource_identifier}-${var.aws_eks_environment}-eksworker-asg"
vpc_zone_identifier = data.aws_subnets.private.ids
health_check_type = "EC2"

tag {
key = "Name"
value = "${var.aws_resource_identifier}-${var.aws_eks_environment}-eksworker-node"
propagate_at_launch = true
}

depends_on = [
aws_iam_role.iam_role_master,
aws_iam_role.iam_role_worker,
aws_security_group.eks_security_group_master,
aws_security_group.eks_security_group_worker
]
}

#resource "aws_eks_node_group" "worker_nodes" {
# cluster_name = aws_eks_cluster.main.name
# node_group_name = "${var.aws_resource_identifier}-ng"
# node_role_arn = aws_iam_role.iam_role_worker.arn
# subnet_ids = data.aws_subnets.private.ids
#
#resource "aws_autoscaling_group" "main" {
# desired_capacity = var.aws_eks_desired_capacity
# launch_template {
# id = aws_launch_template.main.id
# version = "${aws_launch_template.main.latest_version}"
# scaling_config {
# desired_size = var.aws_eks_desired_capacity
# max_size = var.aws_eks_max_size
# min_size = var.aws_eks_min_size
# }
# max_size = var.aws_eks_max_size
# min_size = var.aws_eks_min_size
# name = "${var.aws_resource_identifier}-${var.aws_eks_environment}-eksworker-asg"
# vpc_zone_identifier = data.aws_subnets.private.ids
# health_check_type = "EC2"
#
#tag {
# key = "Name"
# value = "${var.aws_resource_identifier}-${var.aws_eks_environment}-eksworker-node"
# propagate_at_launch = true
#}
# update_config {
# max_unavailable = 1
# }
#
# ami_type = "AL2_x86_64"
#
# #launch_template {
# # id = aws_launch_template.main.id
# # version = "${aws_launch_template.main.latest_version}"
# #}
#
# depends_on = [
# aws_iam_role.iam_role_master,
# aws_iam_role.iam_role_worker,
# aws_iam_role.iam_role_master,
# aws_eks_cluster.main,
# #aws_launch_template.main,
# aws_security_group.eks_security_group_master,
# aws_security_group.eks_security_group_worker
# ]
#}

resource "aws_eks_node_group" "worker_nodes" {
cluster_name = aws_eks_cluster.main.name
node_group_name = "${var.aws_resource_identifier}-ng"
node_role_arn = aws_iam_role.iam_role_worker.arn
subnet_ids = data.aws_subnets.private.ids

scaling_config {
desired_size = var.aws_eks_desired_capacity
max_size = var.aws_eks_max_size
min_size = var.aws_eks_min_size
}

update_config {
max_unavailable = 1
}

ami_type = "AL2_x86_64"

#launch_template {
# id = aws_launch_template.main.id
# version = "${aws_launch_template.main.latest_version}"
#}

depends_on = [
aws_iam_role.iam_role_worker,
aws_iam_role.iam_role_master,
aws_eks_cluster.main,
#aws_launch_template.main,
aws_security_group.eks_security_group_master,
aws_security_group.eks_security_group_worker
]
}

output "aws_eks_cluster_name" {
value = aws_eks_cluster.main.name
}
Expand Down

0 comments on commit 82cbc00

Please sign in to comment.