feat: Remove spegel layer configuration

Author: bmagic

cluster_connect.sh.tpl

@@ -21,7 +21,7 @@ fi
   --b64-cluster-ca ${base64_cluster_ca} \
   --apiserver-endpoint ${api_server_url}
 
-%{ if discard_unpacked_layers == false }
+%{ if discard_unpacked_layers == false && ami_al2023 == false }
 # Retain unpacked layers. We avoid using the configuration merge capability of containerd due to a known bug.
 # For more details, refer to: https://github.com/containerd/containerd/issues/5837
 sed -i '/discard_unpacked_layers = true/s/true/false/' /etc/containerd/config.toml

node_group_advanced.tf

@@ -69,7 +69,7 @@ resource "aws_iam_instance_profile" "quortex" {
 data "aws_ami" "eks_worker_image" {
   filter {
     name   = "name"
-    values = ["amazon-eks-node-al2023-x86_64-standard-${local.kubernetes_worker_nodes_version}-v*"]
+    values = var.ami_al2023 ? ["amazon-eks-node-al2023-x86_64-standard-${local.kubernetes_worker_nodes_version}-v*"] : ["amazon-eks-node-${local.kubernetes_worker_nodes_version}-v*"]
   }
   most_recent = true
   owners      = ["self", "amazon"]
@@ -125,6 +125,7 @@ resource "aws_launch_template" "quortex_launch_tpl" {
             cni_version             = try(var.vpc_cni_addon.version, "")
             show_max_allowed        = var.node_use_max_pods_allowed
             discard_unpacked_layers = var.discard_unpacked_layers
+            ami_al2023              = var.ami_al2023
           }
         )
       }

userdata.sh.tpl

@@ -11,6 +11,22 @@ Content-Disposition: attachment; filename="cloud-config.txt"
 cloud_final_modules:
 - [scripts-user, always]
 
+%{ if var.ami_al2023 && var.discard_unpacked_layers == false }
+--//
+Content-Type: application/node.eks.aws
+Mime-Version: 1.0
+Content-Transfer-Encoding: 7bit
+
+---
+apiVersion: node.eks.aws/v1alpha1
+kind: NodeConfig
+spec:
+    containerd:
+        config: |
+            [plugins."io.containerd.grpc.v1.cri".containerd]
+            discard_unpacked_layers = false
+%{ endif }
+
 --//
 Content-Type: text/x-shellscript; charset="us-ascii"
 MIME-Version: 1.0

variables.tf

@@ -216,6 +216,12 @@ variable "discard_unpacked_layers" {
   description = "Set to false to keep unpacked layers on the node after the image is pulled. By default, EKS will clean up the unpacked layers to save disk space."
 }
 
+variable "ami_al2023" {
+  description = "Whether to use Amazon Linux 2023 AMI for worker nodes (only applies to advanced_node_groups)."
+  type        = bool
+  default     = false
+}
+
 variable "node_use_max_pods_allowed" {
   type        = bool
   default     = false