Add Eks tests in nonparallel batches

terraform/eks/adot-operator/adot_operator.tf

@@ -55,25 +55,24 @@ resource "helm_release" "adot-operator" {
     file("./adot-operator/adot-operator-values.yaml")
   ]
 
-  set {
-    name  = "manager.image.repository"
-    value = var.operator_repository
-  }
-
-  set {
-    name  = "manager.image.tag"
-    value = var.operator_tag
-  }
-
-  set {
-    name  = "manager.collectorImage.tag"
-    value = var.aoc_version
-  }
-
-  set {
-    name  = "manager.collectorImage.repository"
-    value = var.aoc_image_repo
-  }
+  set = [
+    {
+      name  = "manager.image.repository"
+      value = var.operator_repository
+    },
+    {
+      name  = "manager.image.tag"
+      value = var.operator_tag
+    },
+    {
+      name  = "manager.collectorImage.tag"
+      value = var.aoc_version
+    },
+    {
+      name  = "manager.collectorImage.repository"
+      value = var.aoc_image_repo
+    }
+  ]
 
   depends_on = [kubernetes_namespace.adot_operator_ns]
 }

terraform/eks/appmesh/appmesh.tf

@@ -92,21 +92,24 @@ resource "helm_release" "eks" {
   repository = "https://aws.github.io/eks-charts"
   chart      = "appmesh-controller"
   version    = "1.9.0"
+  set = [
+    {
+      name  = "serviceAccount.create"
+      type  = "string"
+      value = "false"
+    },
+    {
+      name  = "serviceAccount.name"
+      type  = "string"
+      value = kubernetes_service_account.appmesh_sa.metadata[0].name
+    },
+    {
+      name  = "region"
+      type  = "string"
+      value = var.region
+    }
+  ]
 
-  set {
-    name  = "serviceAccount.create"
-    value = "false"
-  }
-
-  set {
-    name  = "serviceAccount.name"
-    value = kubernetes_service_account.appmesh_sa.metadata[0].name
-  }
-
-  set {
-    name  = "region"
-    value = var.region
-  }
 
   provisioner "local-exec" {
     command = "kubectl --kubeconfig=${var.kubeconfig} apply -k \"github.com/aws/eks-charts/stable/appmesh-controller/crds?ref=v0.0.116\""

terraform/eks/haproxy/haproxy.tf

@@ -35,26 +35,29 @@ resource "helm_release" "haproxy" {
   chart      = "haproxy-ingress"
   version    = "0.13.9"
 
-  set {
-    name  = "defaultBackend.enabled"
-    value = "true"
-  }
-  set {
-    name  = "controller.stats.enabled"
-    value = "true"
-  }
-  set {
-    name  = "controller.metrics.enabled"
-    value = "true"
-  }
-  set {
-    name  = "controller.metrics.service.annotations.prometheus\\.io/port"
-    type  = "string"
-    value = "9101"
-  }
-  set {
-    name  = "controller.metrics.service.annotations.prometheus\\.io/scrape"
-    type  = "string"
-    value = "true"
-  }
+  set = [
+    {
+      name  = "defaultBackend.enabled"
+      value = "true"
+    },
+    {
+      name  = "controller.stats.enabled"
+      value = "true"
+    },
+    {
+      name  = "controller.metrics.enabled"
+      value = "true"
+    },
+    {
+      name  = "controller.metrics.service.annotations.prometheus\\.io/port"
+      type  = "string"
+      value = "9101"
+    },
+    {
+      name  = "controller.metrics.service.annotations.prometheus\\.io/scrape"
+      type  = "string"
+      value = "true"
+    }
+  ]
+
 }

terraform/eks/main.tf

@@ -75,7 +75,7 @@ resource "local_file" "kubeconfig" {
 }
 
 provider "helm" {
-  kubernetes {
+  kubernetes = {
     host                   = data.aws_eks_cluster.testing_cluster.endpoint
     cluster_ca_certificate = base64decode(data.aws_eks_cluster.testing_cluster.certificate_authority[0].data)
     token                  = data.aws_eks_cluster_auth.testing_cluster.token

terraform/eks/memcached-service/memcached.tf

@@ -34,19 +34,20 @@ resource "helm_release" "bitnami" {
   repository = "https://raw.githubusercontent.com/bitnami/charts/eb5f9a9513d987b519f0ecd732e7031241c50328/bitnami"
   chart      = "memcached"
   version    = "5.8.1"
-
-  set {
-    name  = "metrics.enabled"
-    value = "true"
-  }
-  set {
-    name  = "serviceAnnotations.prometheus\\.io/port"
-    type  = "string"
-    value = "9150"
-  }
-  set {
-    name  = "serviceAnnotations.prometheus\\.io/scrape"
-    type  = "string"
-    value = "true"
-  }
+  set = [
+    {
+      name  = "metrics.enabled"
+      value = "true"
+    },
+    {
+      name  = "serviceAnnotations.prometheus\\.io/port"
+      type  = "string"
+      value = "9150"
+    },
+    {
+      name  = "serviceAnnotations.prometheus\\.io/scrape"
+      type  = "string"
+      value = "true"
+    }
+  ]
 }

terraform/eks/nginx/nginx.tf

@@ -46,20 +46,23 @@ resource "helm_release" "nginx_ingress" {
   chart      = "ingress-nginx"
   version    = "4.4.0"
 
-  set {
-    name  = "controller.metrics.enabled"
-    value = "true"
-  }
-  set {
-    name  = "controller.metrics.service.annotations.prometheus\\.io/port"
-    type  = "string"
-    value = "10254"
-  }
-  set {
-    name  = "controller.metrics.service.annotations.prometheus\\.io/scrape"
-    type  = "string"
-    value = "true"
-  }
+  set = [
+    {
+      name  = "controller.metrics.enabled"
+      value = "true"
+    },
+    {
+      name  = "controller.metrics.service.annotations.prometheus\\.io/port"
+      type  = "string"
+      value = "10254"
+    },
+    {
+      name  = "controller.metrics.service.annotations.prometheus\\.io/scrape"
+      type  = "string"
+      value = "true"
+    }
+  ]
+
 
   provisioner "local-exec" {
     command = "/bin/bash ./nginx/get-service-external-ip.sh"

terraform/eks/otlp.tf

@@ -130,8 +130,6 @@ resource "kubernetes_config_map" "aoc_config_map" {
 
   data = {
     "aoc-config.yml" = module.basic_components.0.otconfig_content
-    "client.qps"    = "100"
-    "client.burst"  = "400"
   }
   depends_on = [kubernetes_service_account.sample-app-sa]
 }
@@ -144,10 +142,9 @@ resource "kubernetes_config_map" "mocked_server_cert" {
     name      = "mocked-server-cert"
     namespace = var.deployment_type == "fargate" ? kubernetes_namespace.aoc_fargate_ns.metadata[0].name : kubernetes_namespace.aoc_ns.metadata[0].name
   }
+
   data = {
     "ca-bundle.crt" = module.basic_components.0.mocked_server_cert_content
-    "client.qps"    = "100"
-    "client.burst"  = "400"
   }
 }
 
@@ -216,8 +213,8 @@ resource "kubernetes_deployment" "aoc_deployment" {
               path = "/"
               port = 8080
             }
-            initial_delay_seconds = 60
-            period_seconds        = 30
+            initial_delay_seconds = 10
+            period_seconds        = 5
           }
         }
 
@@ -230,7 +227,7 @@ resource "kubernetes_deployment" "aoc_deployment" {
 
           resources {
             limits = {
-              cpu    = "200m"
+              cpu    = "100m"
               memory = "256Mi"
             }
           }
@@ -257,10 +254,6 @@ resource "kubernetes_service" "mocked_server_service" {
   metadata {
     name      = "mocked-server"
     namespace = var.deployment_type == "fargate" ? kubernetes_namespace.aoc_fargate_ns.metadata[0].name : kubernetes_namespace.aoc_ns.metadata[0].name
-    annotations = {
-      "qps.authentication.k8s.io"   = "100"
-      "burst.authentication.k8s.io" = "400"
-    }
   }
   spec {
     selector = {
@@ -272,9 +265,6 @@ resource "kubernetes_service" "mocked_server_service" {
       target_port = 8080
     }
   }
-  timeouts {
-    create = "20m"
-  }
 }
 
 resource "kubectl_manifest" "aoc_deployment_adot_operator" {
@@ -321,10 +311,6 @@ resource "kubernetes_service" "sample_app_service" {
   metadata {
     name      = "sample-app"
     namespace = var.deployment_type == "fargate" ? kubernetes_namespace.aoc_fargate_ns.metadata[0].name : kubernetes_namespace.aoc_ns.metadata[0].name
-    annotations = {
-      "qps.authentication.k8s.io"   = "100"
-      "burst.authentication.k8s.io" = "400"
-    }
   }
   spec {
     selector = {
@@ -338,9 +324,6 @@ resource "kubernetes_service" "sample_app_service" {
       target_port = module.common.sample_app_listen_address_port
     }
   }
-  timeouts {
-    create = "20m"
-  }
 }
 
 resource "kubernetes_ingress" "app" {

terraform/eks/otlp/otlp.tf

@@ -13,6 +13,13 @@
 # permissions and limitations under the License.
 # -------------------------------------------------------------------------
 
+terraform {
+  required_providers {
+    kubernetes = {
+      version = "~> 2.0"
+    }
+  }
+}
 
 locals {
   eks_pod_config = yamldecode(data.template_file.eksconfig.rendered)["sample_app"]

terraform/eks/versions.tf

@@ -1,21 +1,17 @@
 terraform {
-  required_version = "1.5.7"
+  required_version = "~> 1.0"
 
   required_providers {
     aws = {
       source  = "hashicorp/aws"
-      version = "4.67.0"
+      version = "~> 4.0"
     }
     kubernetes = {
-      version = "2.36.0"
-    }
-    helm ={
-      source = "hashicorp/helm"
-      version = "2.17.0"
+      version = "~> 2.0"
     }
     kubectl = {
       source  = "gavinbunney/kubectl"
-      version = "1.19.0"
+      version = ">= 1.7.0"
     }
   }
 }

tools/batchTestGenerator/cmd/root.go

@@ -34,8 +34,16 @@ type commandConfig struct {
 }
 
 var includeAllowlist = map[string]struct{}{
-	"EKS":                     {},
-	"EKS_ARM64":               {},
+	"EKS_127":                 {},
+	"EKS_128":                 {},
+	"EKS_129":                 {},
+	"EKS_130":                 {},
+	"EKS_131":                 {},
+	"EKS_ARM64_127":           {},
+	"EKS_ARM64_128":           {},
+	"EKS_ARM64_129":           {},
+	"EKS_ARM64_130":           {},
+	"EKS_ARM64_131":           {},
 	"ECS":                     {},
 	"EKS_FARGATE":             {},
 	"EC2":                     {},