Merge pull request #20 from Ajay-sops/main

Cluster upgrade from 1.26 to 1.27 using terraform
squareops · Mar 11, 2024 · 4d98c76 · 4d98c76
2 parents 50a527c + 8a70b01
commit 4d98c76
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 15 deletions.
diff --git 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"

diff --git 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"

diff --git a/examples/complete/main.tf b/examples/complete/main.tf
@@ -163,6 +163,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 = {
     "Addons-Services" = "true"

diff --git 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
   }
-}
+}