fix(eks): remove aws-auth ConfigMap and update AMI types to AL2023

- Remove explicit aws-auth ConfigMap resources from Windows clusters
  (EKS managed node groups handle node auth automatically)
- Update test matrix from AL2_x86_64 to AL2023_x86_64_STANDARD for K8s 1.35
- Update GPU AMI from AL2_x86_64_GPU to AL2023_x86_64_NVIDIA
- Replace hardcoded ami_type with var.ami_type in node groups

Author: musa-asad

generator/resources/eks_daemon_test_matrix.json

@@ -1,13 +1,13 @@
 [
   {
     "k8sVersion": "1.35",
-    "ami": "AL2_x86_64",
+    "ami": "AL2023_x86_64_STANDARD",
     "instanceType":"t3.medium",
     "arc": "amd64"
   },
   {
     "k8sVersion": "1.35",
-    "ami": "AL2_ARM_64",
+    "ami": "AL2023_ARM_64_STANDARD",
     "instanceType":"m6g.large",
     "arc": "arm64"
   }

generator/test_case_generator.go

@@ -356,7 +356,7 @@ var testTypeToTestConfig = map[string][]testConfig{
 			testDir:      "./test/metric_value_benchmark",
 			targets:      map[string]map[string]struct{}{"arc": {"amd64": {}}},
 			instanceType: "g4dn.xlarge",
-			ami:          "AL2_x86_64_GPU",
+			ami:          "AL2023_x86_64_NVIDIA",
 		},
 		{
 			testDir:      "./test/metric_value_benchmark",
@@ -386,13 +386,13 @@ var testTypeToTestConfig = map[string][]testConfig{
 			testDir: "./test/gpu", terraformDir: "terraform/eks/daemon/gpu",
 			targets:      map[string]map[string]struct{}{"arc": {"amd64": {}}},
 			instanceType: "g4dn.xlarge",
-			ami:          "AL2_x86_64_GPU",
+			ami:          "AL2023_x86_64_NVIDIA",
 		},
 		{
 			testDir: "./test/gpu_high_frequency_metrics", terraformDir: "terraform/eks/daemon/gpu",
 			targets:      map[string]map[string]struct{}{"arc": {"amd64": {}}},
 			instanceType: "g4dn.xlarge",
-			ami:          "AL2_x86_64_GPU",
+			ami:          "AL2023_x86_64_NVIDIA",
 		},
 		{
 			testDir: "./test/awsneuron", terraformDir: "terraform/eks/daemon/awsneuron",

terraform/eks/daemon/app_signals/main.tf

@@ -47,7 +47,7 @@ resource "aws_eks_node_group" "this" {
     min_size     = 1
   }
 
-  ami_type       = "AL2_x86_64"
+  ami_type       = var.ami_type
   capacity_type  = "ON_DEMAND"
   disk_size      = 20
   instance_types = ["t3.medium"]

terraform/eks/daemon/awsneuron/main.tf

@@ -47,7 +47,7 @@ resource "aws_eks_node_group" "this" {
     min_size     = 1
   }
 
-  ami_type       = "AL2_x86_64"
+  ami_type       = var.ami_type
   capacity_type  = "ON_DEMAND"
   disk_size      = 20
   instance_types = ["t3.medium"]

terraform/eks/daemon/emf/main.tf

@@ -47,7 +47,7 @@ resource "aws_eks_node_group" "this" {
     min_size     = 1
   }
 
-  ami_type       = "AL2_x86_64"
+  ami_type       = var.ami_type
   capacity_type  = "ON_DEMAND"
   disk_size      = 20
   instance_types = ["t3.medium"]

terraform/eks/daemon/fluent/windows/main.tf

@@ -83,35 +83,6 @@ resource "aws_iam_role" "node_role" {
   })
 }
 
-## AWS CONFIGMAP
-
-resource "kubernetes_config_map" "configmap" {
-  data = {
-    "mapRoles" = <<EOT
-- groups:
-  - system:bootstrappers
-  - system:nodes
-  rolearn: arn:aws:iam::${data.aws_caller_identity.account_id.account_id}:role/${aws_iam_role.node_role.name}
-  username: system:node:{{EC2PrivateDNSName}}
-- groups:
-  - eks:kube-proxy-windows
-  - system:bootstrappers
-  - system:nodes
-  rolearn: arn:aws:iam::${data.aws_caller_identity.account_id.account_id}:role/${aws_iam_role.node_role.name}
-  username: system:node:{{EC2PrivateDNSName}}
-- groups:
-  - system:masters
-  rolearn: arn:aws:iam::${data.aws_caller_identity.account_id.account_id}:role/Admin-Windows
-
-EOT
-  }
-
-  metadata {
-    name      = "aws-auth"
-    namespace = "kube-system"
-  }
-}
-
 # EKS Node Groups
 resource "aws_eks_node_group" "node_group" {
   cluster_name    = aws_eks_cluster.cluster.name

terraform/eks/daemon/main.tf

@@ -47,7 +47,7 @@ resource "aws_eks_node_group" "this" {
     min_size     = 1
   }
 
-  ami_type       = "AL2_x86_64"
+  ami_type       = var.ami_type
   capacity_type  = "ON_DEMAND"
   disk_size      = 20
   instance_types = ["t3.medium"]

terraform/eks/daemon/statsd/main.tf

@@ -47,7 +47,7 @@ resource "aws_eks_node_group" "this" {
     min_size     = 1
   }
 
-  ami_type       = "AL2_x86_64"
+  ami_type       = var.ami_type
   capacity_type  = "ON_DEMAND"
   disk_size      = 20
   instance_types = ["t3.medium"]

terraform/eks/daemon/windows/main.tf

@@ -75,35 +75,6 @@ resource "kubernetes_config_map_v1_data" "amazon_vpc_cni_windows" {
   }
 }
 
-## AWS CONFIGMAP
-
-resource "kubernetes_config_map" "configmap" {
-  data = {
-    "mapRoles" = <<EOT
-- groups:
-  - system:bootstrappers
-  - system:nodes
-  rolearn: arn:aws:iam::${data.aws_caller_identity.account_id.account_id}:role/cwagent-eks-Worker-Role-${module.common.testing_id}
-  username: system:node:{{EC2PrivateDNSName}}
-- groups:
-  - eks:kube-proxy-windows
-  - system:bootstrappers
-  - system:nodes
-  rolearn: arn:aws:iam::${data.aws_caller_identity.account_id.account_id}:role/cwagent-eks-Worker-Role-${module.common.testing_id}
-  username: system:node:{{EC2PrivateDNSName}}
-- groups:
-  - system:masters
-  rolearn: arn:aws:iam::${data.aws_caller_identity.account_id.account_id}:role/Admin-Windows
-
-EOT
-  }
-
-  metadata {
-    name      = "aws-auth"
-    namespace = "kube-system"
-  }
-}
-
 # EKS Node Groups
 resource "aws_eks_node_group" "this" {
   cluster_name    = aws_eks_cluster.this.name
@@ -117,7 +88,7 @@ resource "aws_eks_node_group" "this" {
     min_size     = 1
   }
 
-  ami_type       = "AL2_x86_64"
+  ami_type       = var.ami_type
   capacity_type  = "ON_DEMAND"
   disk_size      = 20
   instance_types = ["t3.medium"]