Merge pull request #1654 from thpierce/patch-1

Update E2E Collector tests to use different collector names for each concurrent test
aws-observability · Jul 10, 2024 · c0ad0f8 · c0ad0f8
2 parents 45baf87 + 062119e
commit c0ad0f8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/terraform/eks/adot-operator/adot_collector_deployment.tpl b/terraform/eks/adot-operator/adot_collector_deployment.tpl
@@ -1,7 +1,7 @@
 apiVersion: opentelemetry.io/v1alpha1
 kind: OpenTelemetryCollector
 metadata:
-  name: aoc
+  name: ${AOC_NAME}
   namespace: ${AOC_NAMESPACE}
 spec:
   image: ${AOC_IMAGE}

diff --git a/terraform/eks/otlp.tf b/terraform/eks/otlp.tf
@@ -273,6 +273,7 @@ data "template_file" "adot_collector_config_file" {
   template = file("./adot-operator/adot_collector_deployment.tpl")
 
   vars = {
+    AOC_NAME           = var.deployment_type == "fargate" ? "aoc-fargate" : "aoc"
     AOC_NAMESPACE      = var.deployment_type == "fargate" ? kubernetes_namespace.aoc_fargate_ns.metadata[0].name : kubernetes_namespace.aoc_ns.metadata[0].name
     AOC_IMAGE          = module.common.aoc_image
     AOC_DEPLOY_MODE    = var.aoc_deploy_mode