From 6cb391bcebd553440555720a631868311433c516 Mon Sep 17 00:00:00 2001 From: devops0706 Date: Thu, 7 Mar 2024 18:48:13 +0530 Subject: [PATCH 1/5] cluster version upgrade from 1.26 to 1.27 using terraform --- examples/complete/main.tf | 3 ++- modules/managed-nodegroup/main.tf | 22 ++++++++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 4f61fea..612e924 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -158,11 +158,12 @@ module "managed_node_group_production" { kms_key_arn = module.kms.key_arn capacity_type = "ON_DEMAND" ebs_volume_size = 50 - instance_types = ["t3a.large", "t2.large", "t2.xlarge", "t3.large", "m5.large"] + instance_types = ["t3.large"] kms_policy_arn = module.eks.kms_policy_arn eks_cluster_name = module.eks.cluster_name default_addon_enabled = local.default_addon_enabled worker_iam_role_name = module.eks.worker_iam_role_name + worker_iam_role_arn = module.eks.worker_iam_role_arn eks_nodes_keypair_name = module.key_pair_eks.key_pair_name k8s_labels = { "Addons-Services" = "true" diff --git a/modules/managed-nodegroup/main.tf b/modules/managed-nodegroup/main.tf index 5ee651b..1cfa843 100644 --- a/modules/managed-nodegroup/main.tf +++ b/modules/managed-nodegroup/main.tf @@ -2,10 +2,6 @@ data "aws_eks_cluster" "eks" { name = var.eks_cluster_name } -data "aws_iam_role" "worker_iam_role_name" { - name = var.worker_iam_role_name -} - data "aws_ami" "launch_template_ami" { owners = ["602401143452"] most_recent = true @@ -71,28 +67,26 @@ resource "aws_launch_template" "eks_template" { resource "aws_eks_node_group" "managed_ng" { subnet_ids = var.subnet_ids cluster_name = var.eks_cluster_name - node_role_arn = data.aws_iam_role.worker_iam_role_name.arn + node_role_arn = var.worker_iam_role_arn node_group_name = format("%s-%s-%s", var.environment, var.name, "ng") scaling_config { desired_size = var.desired_size max_size = var.max_size min_size = var.min_size } - labels = var.k8s_labels - capacity_type = var.capacity_type - instance_types = var.instance_types + labels = var.k8s_labels + capacity_type = var.capacity_type + instance_types = var.instance_types + force_update_version = true launch_template { id = aws_launch_template.eks_template.id version = aws_launch_template.eks_template.latest_version } - lifecycle { - create_before_destroy = true - ignore_changes = [ - scaling_config[0].desired_size, - ] + update_config { + max_unavailable_percentage = 50 } tags = { Name = format("%s-%s-%s", var.environment, var.name, "ng") Environment = var.environment } -} +} \ No newline at end of file From a91ed6dd7a1583e64523bf4d84cf3c8a05aed849 Mon Sep 17 00:00:00 2001 From: devops0706 Date: Thu, 7 Mar 2024 19:10:33 +0530 Subject: [PATCH 2/5] updated instance size in example complete file --- examples/complete/main.tf | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 612e924..6a49a64 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -158,7 +158,7 @@ module "managed_node_group_production" { kms_key_arn = module.kms.key_arn capacity_type = "ON_DEMAND" ebs_volume_size = 50 - instance_types = ["t3.large"] + instance_types = ["t3a.large", "t2.large", "t2.xlarge", "t3.large", "m5.large"] kms_policy_arn = module.eks.kms_policy_arn eks_cluster_name = module.eks.cluster_name default_addon_enabled = local.default_addon_enabled @@ -171,15 +171,15 @@ module "managed_node_group_production" { tags = local.additional_aws_tags } -module "farget_profle" { - source = "squareops/eks/aws//modules/fargate-profile" - depends_on = [module.vpc, module.eks] - profile_name = "app" - subnet_ids = [module.vpc.private_subnets[0]] - environment = local.environment - cluster_name = module.eks.cluster_name - namespace = "" - labels = { - "App-Services" = "fargate" - } -} +# module "farget_profle" { +# source = "squareops/eks/aws//modules/fargate-profile" +# depends_on = [module.vpc, module.eks] +# profile_name = "app" +# subnet_ids = [module.vpc.private_subnets[0]] +# environment = local.environment +# cluster_name = module.eks.cluster_name +# namespace = "" +# labels = { +# "App-Services" = "fargate" +# } +# } From 8b2695e0dde8146db6401a266f6a146692a29365 Mon Sep 17 00:00:00 2001 From: devops0706 Date: Thu, 7 Mar 2024 19:12:15 +0530 Subject: [PATCH 3/5] uncommented farget profile --- examples/complete/main.tf | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/complete/main.tf b/examples/complete/main.tf index 6a49a64..d2816e6 100644 --- a/examples/complete/main.tf +++ b/examples/complete/main.tf @@ -171,15 +171,15 @@ module "managed_node_group_production" { tags = local.additional_aws_tags } -# module "farget_profle" { -# source = "squareops/eks/aws//modules/fargate-profile" -# depends_on = [module.vpc, module.eks] -# profile_name = "app" -# subnet_ids = [module.vpc.private_subnets[0]] -# environment = local.environment -# cluster_name = module.eks.cluster_name -# namespace = "" -# labels = { -# "App-Services" = "fargate" -# } -# } +module "farget_profle" { + source = "squareops/eks/aws//modules/fargate-profile" + depends_on = [module.vpc, module.eks] + profile_name = "app" + subnet_ids = [module.vpc.private_subnets[0]] + environment = local.environment + cluster_name = module.eks.cluster_name + namespace = "" + labels = { + "App-Services" = "fargate" + } +} From ab7617c0396ed3525fa62a33e7cd47d3504a3b53 Mon Sep 17 00:00:00 2001 From: Rohit Singh <107384244+RohitSquareops@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:32:13 +0530 Subject: [PATCH 4/5] Update main.tf in example references --- examples/complete-ipv6/main.tf | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/complete-ipv6/main.tf b/examples/complete-ipv6/main.tf index 757580d..86832b0 100644 --- a/examples/complete-ipv6/main.tf +++ b/examples/complete-ipv6/main.tf @@ -170,6 +170,7 @@ module "managed_node_group_production" { eks_cluster_name = module.eks.cluster_name default_addon_enabled = local.default_addon_enabled worker_iam_role_name = module.eks.worker_iam_role_name + worker_iam_role_arn = module.eks.worker_iam_role_arn eks_nodes_keypair_name = module.key_pair_eks.key_pair_name k8s_labels = { "Addon-Services" = "true" From 8a70b01d97cbbf5070dc36bad83a1e2454ed2cd1 Mon Sep 17 00:00:00 2001 From: Rohit Singh <107384244+RohitSquareops@users.noreply.github.com> Date: Mon, 11 Mar 2024 17:33:40 +0530 Subject: [PATCH 5/5] Update README.md for example references --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 6b978e1..211857f 100644 --- a/README.md +++ b/README.md @@ -79,10 +79,11 @@ module "managed_node_group_production" { kms_policy_arn = module.eks.kms_policy_arn eks_cluster_name = module.eks.cluster_name worker_iam_role_name = module.eks.worker_iam_role_name + worker_iam_role_arn = module.eks.worker_iam_role_arn default_addon_enabled = true eks_nodes_keypair_name = "key-pair-name" k8s_labels = { - "Infra-Services" = "true" + "Addons-Services" = "true" } tags = { Name = "prod-cluster"