Set collector image and tag in helm chart

aws-observability · May 10, 2024 · 11435af · 11435af
1 parent 30ceb72
commit 11435af
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 1 deletion.
diff --git a/terraform/common.tf b/terraform/common.tf
@@ -31,7 +31,7 @@ variable "sample_app_image" {
 }
 
 variable "aoc_image_repo" {
-  default = "public.ecr.aws/aws-otel-test/adot-collector-integration-test"
+  default = "public.ecr.aws/aws-observability/aws-otel-collector"
 }
 
 variable "aoc_version" {

diff --git a/terraform/eks/adot-operator/adot_operator.tf b/terraform/eks/adot-operator/adot_operator.tf
@@ -29,6 +29,12 @@ variable "operator_repository" {
 variable "operator_tag" {
 }
 
+variable "aoc_image_repo" {
+}
+
+variable "aoc_version" {
+}
+
 resource "helm_release" "adot-operator" {
   name = "adot-operator-${var.testing_id}"
 
@@ -49,6 +55,16 @@ resource "helm_release" "adot-operator" {
     value = var.operator_tag
   }
 
+  set {
+    name  = "manager.collectorImage.tag"
+    value = var.aoc_version
+  }
+
+  set {
+    name  = "manager.collectorImage.repository"
+    value = var.aoc_image_repo
+  }
+
   provisioner "local-exec" {
     command = "kubectl wait --kubeconfig=${var.kubeconfig} --timeout=5m --for=condition=available deployment adot-operator-${var.testing_id}-opentelemetry-operator"
   }

diff --git a/terraform/eks/main.tf b/terraform/eks/main.tf
@@ -180,6 +180,8 @@ module "adot_operator" {
   kubeconfig          = local_file.kubeconfig.filename
   operator_repository = var.operator_repository
   operator_tag        = var.operator_tag
+  aoc_image_repo      = var.aoc_image_repo
+  aoc_version         = var.aoc_version
 }