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

musa-asad · musa-asad · commit ff59a14c2359 · 2026-05-12T20:21:47.000Z
- 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
diff --git a/generator/resources/eks_addon_test_matrix.json b/generator/resources/eks_addon_test_matrix.json
@@ -1,7 +1,7 @@
 [
   {
     "k8sVersion": "1.31",
-    "ami": "AL2_x86_64_GPU",
+    "ami": "AL2023_x86_64_NVIDIA",
     "terraform_dir": "terraform/eks/addon/gpu",
     "test_dir": "./test/gpu",
     "instanceType":"g4dn.xlarge"
diff --git a/generator/resources/eks_daemon_test_matrix.json b/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"
   }
diff --git a/generator/test_case_generator.go b/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",
diff --git a/terraform/eks/addon/gpu/variables.tf b/terraform/eks/addon/gpu/variables.tf
@@ -23,7 +23,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64_GPU"
+  default = "AL2023_x86_64_NVIDIA"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/app_signals/main.tf b/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"]
diff --git a/terraform/eks/daemon/app_signals/variables.tf b/terraform/eks/daemon/app_signals/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/awsneuron/main.tf b/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"]
diff --git a/terraform/eks/daemon/awsneuron/variables.tf b/terraform/eks/daemon/awsneuron/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/credentials/pod_identity/variables.tf b/terraform/eks/daemon/credentials/pod_identity/variables.tf
@@ -18,7 +18,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/ebs/variables.tf b/terraform/eks/daemon/ebs/variables.tf
@@ -33,7 +33,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/emf/main.tf b/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"]
diff --git a/terraform/eks/daemon/emf/variables.tf b/terraform/eks/daemon/emf/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/entity/variables.tf b/terraform/eks/daemon/entity/variables.tf
@@ -18,7 +18,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/fluent/bit/variables.tf b/terraform/eks/daemon/fluent/bit/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/fluent/common/variables.tf b/terraform/eks/daemon/fluent/common/variables.tf
@@ -29,7 +29,7 @@ variable "k8s_version" {
 // ami_type and instance_type can be used to test ARM node group
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/fluent/d/variables.tf b/terraform/eks/daemon/fluent/d/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/fluent/windows/2019/variables.tf b/terraform/eks/daemon/fluent/windows/2019/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/fluent/windows/2022/variables.tf b/terraform/eks/daemon/fluent/windows/2022/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/fluent/windows/main.tf b/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
diff --git a/terraform/eks/daemon/fluent/windows/variables.tf b/terraform/eks/daemon/fluent/windows/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/gpu/variables.tf b/terraform/eks/daemon/gpu/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64_GPU"
+  default = "AL2023_x86_64_NVIDIA"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/liscsi/variables.tf b/terraform/eks/daemon/liscsi/variables.tf
@@ -33,7 +33,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/main.tf b/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"]
diff --git a/terraform/eks/daemon/statsd/main.tf b/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"]
diff --git a/terraform/eks/daemon/statsd/variables.tf b/terraform/eks/daemon/statsd/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/variables.tf b/terraform/eks/daemon/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/windows/2019/variables.tf b/terraform/eks/daemon/windows/2019/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/windows/2022/variables.tf b/terraform/eks/daemon/windows/2022/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {
diff --git a/terraform/eks/daemon/windows/main.tf b/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"]
diff --git a/terraform/eks/daemon/windows/variables.tf b/terraform/eks/daemon/windows/variables.tf
@@ -28,7 +28,7 @@ variable "k8s_version" {
 
 variable "ami_type" {
   type    = string
-  default = "AL2_x86_64"
+  default = "AL2023_x86_64_STANDARD"
 }
 
 variable "instance_type" {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"k8sVersion": "1.31",`
`4`		`- "ami": "AL2_x86_64_GPU",`
	`4`	`+ "ami": "AL2023_x86_64_NVIDIA",`
`5`	`5`	`"terraform_dir": "terraform/eks/addon/gpu",`
`6`	`6`	`"test_dir": "./test/gpu",`
`7`	`7`	`"instanceType":"g4dn.xlarge"`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,13 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"k8sVersion": "1.35",`
`4`		`- "ami": "AL2_x86_64",`
	`4`	`+ "ami": "AL2023_x86_64_STANDARD",`
`5`	`5`	`"instanceType":"t3.medium",`
`6`	`6`	`"arc": "amd64"`
`7`	`7`	`},`
`8`	`8`	`{`
`9`	`9`	`"k8sVersion": "1.35",`
`10`		`- "ami": "AL2_ARM_64",`
	`10`	`+ "ami": "AL2023_ARM_64_STANDARD",`
`11`	`11`	`"instanceType":"m6g.large",`
`12`	`12`	`"arc": "arm64"`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ variable "k8s_version" {`
`23`	`23`
`24`	`24`	`variable "ami_type" {`
`25`	`25`	`type = string`
`26`		`- default = "AL2_x86_64_GPU"`
	`26`	`+ default = "AL2023_x86_64_NVIDIA"`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`variable "instance_type" {`
Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ resource "aws_eks_node_group" "this" {`
`47`	`47`	`min_size = 1`
`48`	`48`	`}`
`49`	`49`
`50`		`- ami_type = "AL2_x86_64"`
	`50`	`+ ami_type = var.ami_type`
`51`	`51`	`capacity_type = "ON_DEMAND"`
`52`	`52`	`disk_size = 20`
`53`	`53`	`instance_types = ["t3.medium"]`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ variable "k8s_version" {`
`28`	`28`
`29`	`29`	`variable "ami_type" {`
`30`	`30`	`type = string`
`31`		`- default = "AL2_x86_64"`
	`31`	`+ default = "AL2023_x86_64_STANDARD"`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`variable "instance_type" {`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ variable "k8s_version" {`
`18`	`18`
`19`	`19`	`variable "ami_type" {`
`20`	`20`	`type = string`
`21`		`- default = "AL2_x86_64"`
	`21`	`+ default = "AL2023_x86_64_STANDARD"`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`variable "instance_type" {`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ variable "k8s_version" {`
`33`	`33`
`34`	`34`	`variable "ami_type" {`
`35`	`35`	`type = string`
`36`		`- default = "AL2_x86_64"`
	`36`	`+ default = "AL2023_x86_64_STANDARD"`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`variable "instance_type" {`