Merge pull request #1658 from vasireddy99/fixconfig

[release/v0.40.x] Update otel crd to `v1apha1` in tests
aws-observability · Jul 30, 2024 · 634b091 · 634b091
2 parents 3bc71db + 395627a
commit 634b091
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 17 deletions.
diff --git a/terraform/eks/adot-operator/adot_collector_deployment.tpl b/terraform/eks/adot-operator/adot_collector_deployment.tpl
diff --git a/terraform/eks/otlp.tf b/terraform/eks/otlp.tf
@@ -271,7 +271,7 @@ resource "kubectl_manifest" "aoc_deployment_adot_operator" {
   count = local.is_otlp_base_scenario && local.is_operator_testcase ? 1 : 0
 
   yaml_body  = <<-EOF
-    apiVersion: opentelemetry.io/v1beta1
+    apiVersion: opentelemetry.io/v1alpha1
     kind: OpenTelemetryCollector
     metadata:
       name: aoc
@@ -280,7 +280,7 @@ resource "kubectl_manifest" "aoc_deployment_adot_operator" {
       image: ${module.common.aoc_image}
       mode: ${var.aoc_deploy_mode}
       serviceAccount: aoc-role-${module.common.testing_id}
-      config:
+      config: |
         ${module.basic_components.0.otconfig_content}
     EOF
   depends_on = [module.adot_operator]

diff --git a/terraform/testcases/otlp_metric_adot_operator/otconfig.tpl b/terraform/testcases/otlp_metric_adot_operator/otconfig.tpl
@@ -8,7 +8,7 @@ extensions:
             endpoint: 0.0.0.0:${grpc_port}
 
     processors:
-      batch: {}
+      batch:
 
     exporters:
       awsemf:

diff --git a/terraform/testcases/otlp_metric_auto_instrumentation_adot_operator/otconfig.tpl b/terraform/testcases/otlp_metric_auto_instrumentation_adot_operator/otconfig.tpl
@@ -5,7 +5,7 @@ receivers:
             endpoint: 0.0.0.0:${grpc_port}
 
     processors:
-      batch: {}
+      batch:
 
     exporters:
       awsemf:

diff --git a/terraform/testcases/otlp_trace_adot_operator/otconfig.tpl b/terraform/testcases/otlp_trace_adot_operator/otconfig.tpl
@@ -8,7 +8,7 @@ extensions:
             endpoint: 0.0.0.0:${grpc_port}
 
     processors:
-      batch: {}
+      batch:
 
     exporters:
       awsxray:

diff --git a/terraform/testcases/otlp_trace_auto_instrumentation_adot_operator/otconfig.tpl b/terraform/testcases/otlp_trace_auto_instrumentation_adot_operator/otconfig.tpl
@@ -5,7 +5,7 @@ receivers:
             endpoint: 0.0.0.0:${grpc_port}
 
     processors:
-      batch:{}
+      batch:
 
     exporters:
       awsxray: