Merge pull request #323 from mark5cinco/eks-support-node-release-version-config

Eks support node release version config

Author: pst

aws/_modules/eks/node_pool.tf

@@ -22,7 +22,8 @@ module "node_pool" {
 
   taints = var.taints
 
-  ami_type = null
+  ami_type            = null
+  ami_release_version = var.worker_ami_release_version
 
   tags = var.additional_node_tags
 

aws/_modules/eks/node_pool/launch_template.tf

@@ -5,14 +5,18 @@ locals {
   launch_template_name_hash  = sha256(local.launch_template_name_parts)
   launch_template_name       = "${substr(local.launch_template_name_parts, 0, 120)}-${substr(local.launch_template_name_hash, 0, 7)}"
 
-  cpu_ami_name = data.aws_ec2_instance_type.current.supported_architectures[0] == "arm64" ? "amazon-linux-2-arm64" : "amazon-linux-2"
-  ami_name     = length(data.aws_ec2_instance_type.current.gpus) > 0 ? "amazon-linux-2-gpu" : local.cpu_ami_name
+  cpu_ami_name       = data.aws_ec2_instance_type.current.supported_architectures[0] == "arm64" ? "amazon-linux-2-arm64" : "amazon-linux-2"
+  is_gpu             = length(data.aws_ec2_instance_type.current.gpus) > 0
+  ami_name           = local.is_gpu ? "amazon-linux-2-gpu" : local.cpu_ami_name
+  ami_release_prefix = local.is_gpu ? "amazon-eks-gpu-node" : "amazon-eks-node"
+  ami_release_date   = split("-", var.ami_release_version)[1]
+  ami_release_name   = var.ami_release_version == null ? "recommended" : "${local.ami_release_prefix}-${var.kubernetes_version}-v${local.ami_release_date}"
 }
 
 data "aws_ssm_parameter" "eks_ami_release_version" {
   count = var.disk_size != null ? 1 : 0
 
-  name = "/aws/service/eks/optimized-ami/${var.kubernetes_version}/${local.ami_name}/recommended/image_id"
+  name = "/aws/service/eks/optimized-ami/${var.kubernetes_version}/${local.ami_name}/${local.ami_release_name}/image_id"
 }
 
 data "aws_ami" "eks_optimized" {

aws/_modules/eks/node_pool/main.tf

@@ -20,9 +20,10 @@ resource "aws_eks_node_group" "nodes" {
     min_size     = var.min_size
   }
 
-  version        = var.kubernetes_version
-  ami_type       = var.ami_type == null ? local.ami_type : var.ami_type
-  instance_types = var.instance_types
+  version         = var.kubernetes_version
+  ami_type        = var.ami_type == null ? local.ami_type : var.ami_type
+  release_version = var.ami_release_version
+  instance_types  = var.instance_types
 
   disk_size = local.create_launch_template ? null : var.disk_size
 

aws/_modules/eks/node_pool/variables.tf

@@ -85,6 +85,12 @@ variable "ami_type" {
   description = "AMI type to use for nodes of the node pool."
 }
 
+variable "ami_release_version" {
+  type        = string
+  description = "AMI version of the EKS Node Group. Defaults to latest version for Kubernetes version"
+  default     = null
+}
+
 variable "kubernetes_version" {
   type        = string
   description = "Kubernetes version to use for node pool."

aws/_modules/eks/variables.tf

@@ -172,6 +172,12 @@ variable "cluster_encryption_key_arn" {
   description = "Arn of an AWS KMS symmetric key to be used for encryption of kubernetes resources."
 }
 
+variable "worker_ami_release_version" {
+  type        = string
+  default     = null
+  description = "AMI version of the EKS Node Group. Defaults to latest version for Kubernetes version. A list of release versions can be found in https://github.com/awslabs/amazon-eks-ami/blob/master/CHANGELOG.md"
+}
+
 variable "metadata_options" {
   description = "EC2 metadata service options."
   type = object({

aws/cluster/configuration.tf

@@ -67,6 +67,8 @@ locals {
   worker_root_device_volume_size = lookup(local.cfg, "worker_root_device_volume_size", null)
   worker_root_device_encrypted   = lookup(local.cfg, "worker_root_device_encrypted", null)
 
+  worker_ami_release_version = lookup(local.cfg, "worker_ami_release_version", null)
+
   cluster_aws_auth_map_roles    = lookup(local.cfg, "cluster_aws_auth_map_roles", "")
   cluster_aws_auth_map_users    = lookup(local.cfg, "cluster_aws_auth_map_users", "")
   cluster_aws_auth_map_accounts = lookup(local.cfg, "cluster_aws_auth_map_accounts", "")

aws/cluster/main.tf

@@ -59,6 +59,8 @@ module "cluster" {
 
   cluster_encryption_key_arn = local.cluster_encryption_key_arn
 
+  worker_ami_release_version = local.worker_ami_release_version
+
   # cluster module configuration is still map(string)
   # once module_variable_optional_attrs isn't experimental anymore
   # we can migrate cluster module configuration to map(object(...))

aws/cluster/node-pool/configuration.tf

@@ -11,6 +11,7 @@ locals {
 
   instance_types_lookup = local.cfg["instance_types"] == null ? "" : local.cfg["instance_types"]
   instance_types        = toset(split(",", local.instance_types_lookup))
+  ami_release_version   = lookup(local.cfg, "ami_release_version")
   desired_capacity      = lookup(local.cfg, "desired_capacity")
   min_size              = lookup(local.cfg, "min_size")
   max_size              = lookup(local.cfg, "max_size")

aws/cluster/node-pool/main.tf

@@ -20,10 +20,11 @@ module "node_pool" {
 
   subnet_ids = local.vpc_subnet_newbits == null ? local.vpc_subnet_ids : aws_subnet.current.*.id
 
-  instance_types = local.instance_types
-  desired_size   = local.desired_capacity
-  max_size       = local.max_size
-  min_size       = local.min_size
+  instance_types      = local.instance_types
+  ami_release_version = local.ami_release_version
+  desired_size        = local.desired_capacity
+  max_size            = local.max_size
+  min_size            = local.min_size
 
   ami_type = local.ami_type
 

aws/cluster/node-pool/variables.tf

@@ -3,11 +3,12 @@ variable "configuration" {
 
     name = optional(string)
 
-    instance_types   = optional(string)
-    desired_capacity = optional(string)
-    min_size         = optional(string)
-    max_size         = optional(string)
-    disk_size        = optional(string)
+    instance_types      = optional(string)
+    ami_release_version = optional(string)
+    desired_capacity    = optional(string)
+    min_size            = optional(string)
+    max_size            = optional(string)
+    disk_size           = optional(string)
 
     ami_type = optional(string)